From 394da0a313b574c3e233287cdfc21d4f408a7245 Mon Sep 17 00:00:00 2001 From: yhh <359807859@qq.com> Date: Wed, 23 Sep 2026 18:28:21 -0700 Subject: [PATCH] refactor: the kernel's packages live in the layer they belong to internal/ was 141 packages side by side, so nothing but a reader's memory said which were foundations and which assembled the rest. Each now sits in a layer directory, and the directory is the declaration: base L0 foundation with no domain in it contract L1 types and interfaces the layers above agree on model, tools, safety, ext, state, platform L2 subsystems, peers of one another runtime L3 the turn engine session L4 the controller assembly L5 the composition root frontend L6 cli, serve, acp and the host adapters Only paths change: package names, code and behaviour do not. Imports, repolint and coverage baselines, sensitive paths, CI package lists and docs follow the new paths; release notes keep the paths they were written with, and sample paths inside tests and fixtures keep theirs. repolint gains layer-order: a package may import its own layer and those below it, read from where it lives. The 47 imports that point upward today are recorded as that rule's opening debt (-allow-widen, a new rule's first baseline) and can only go down. Most of it is config, which still reaches into eight subsystems and is the next thing to take apart; the rest is event, history and a few tools reaching into runtime for types that belong in contract. --- .github/labeler.yml | 18 +- .github/workflows/ci.yml | 22 +- .goreleaser.yaml | 2 +- CONTRIBUTING.md | 46 +- REASONIX.md | 46 +- benchmarks/catalog-detector/detector.go | 2 +- benchmarks/catalog-detector/verdict.go | 2 +- benchmarks/compaction/main.go | 14 +- benchmarks/compaction/probes.go | 10 +- benchmarks/compaction/session.go | 4 +- benchmarks/context-maintenance-e2e/main.go | 10 +- benchmarks/context-retrieval/capture.go | 14 +- benchmarks/context-retrieval/contextbench.go | 4 +- .../context-retrieval/contextbench_test.go | 2 +- benchmarks/context-retrieval/corpus.go | 4 +- benchmarks/context-retrieval/fixture.go | 10 +- benchmarks/context-retrieval/preflight.go | 6 +- benchmarks/context-retrieval/reformulation.go | 2 +- benchmarks/context-retrieval/run.go | 16 +- benchmarks/context-retrieval/scripted.go | 2 +- benchmarks/context-retrieval/snippet.go | 10 +- benchmarks/project-check/README.md | 4 +- benchmarks/runtime-resume/README.md | 4 +- benchmarks/runtime-resume/activestore.go | 6 +- benchmarks/runtime-resume/arms.go | 8 +- benchmarks/runtime-resume/cancelrouting.go | 4 +- benchmarks/runtime-resume/derive.go | 8 +- benchmarks/runtime-resume/ephemeral.go | 6 +- benchmarks/runtime-resume/fanout.go | 6 +- benchmarks/runtime-resume/graph.go | 8 +- benchmarks/runtime-resume/hostexec.go | 4 +- benchmarks/runtime-resume/lineage.go | 2 +- benchmarks/runtime-resume/lonetask.go | 8 +- benchmarks/runtime-resume/lonetaskrows.go | 6 +- benchmarks/runtime-resume/observe.go | 14 +- benchmarks/runtime-resume/phases.go | 6 +- benchmarks/runtime-resume/runtime.go | 8 +- benchmarks/runtime-resume/schedwait.go | 4 +- benchmarks/runtime-resume/scripted.go | 2 +- benchmarks/runtime-resume/skillclass.go | 8 +- benchmarks/runtime-resume/terminal.go | 4 +- benchmarks/runtime-resume/uigraph.go | 14 +- benchmarks/tool-surface-cache/README.md | 2 +- cmd/e2ebench/barrier.go | 2 +- cmd/e2ebench/checkpoints_test.go | 2 +- cmd/e2ebench/compare_test.go | 2 +- cmd/e2ebench/corpus_test.go | 2 +- cmd/e2ebench/diff.go | 8 +- cmd/e2ebench/diff_test.go | 2 +- cmd/e2ebench/fanout.go | 2 +- cmd/e2ebench/grader_note_test.go | 2 +- cmd/e2ebench/main.go | 14 +- cmd/e2ebench/mechanisms_test.go | 2 +- cmd/e2ebench/memorybench.go | 2 +- cmd/e2ebench/memorybench_test.go | 2 +- cmd/e2ebench/meterconfig_test.go | 2 +- cmd/e2ebench/metrics_mirror_test.go | 4 +- cmd/e2ebench/outcome_test.go | 2 +- cmd/e2ebench/profile.go | 2 +- cmd/e2ebench/profile_test.go | 2 +- cmd/e2ebench/segmentrun_test.go | 2 +- cmd/e2ebench/sft_test.go | 2 +- cmd/e2ebench/spend.go | 2 +- cmd/e2ebench/swebench.go | 2 +- cmd/e2ebench/swebench_run.go | 4 +- cmd/e2ebench/swebench_test.go | 4 +- cmd/e2ebench/trajectory.go | 2 +- cmd/e2ebench/trajectory_test.go | 2 +- cmd/extension-protocol-gen/main.go | 2 +- cmd/reasonix-plugin-example/main.go | 2 +- cmd/reasonix-studio-host/main.go | 30 +- cmd/reasonix-studio-host/main_test.go | 14 +- cmd/reasonix-studio-host/packagegrants.go | 2 +- .../packagegrants_test.go | 2 +- cmd/reasonix-studio-host/wiring_test.go | 4 +- cmd/reasonix/main.go | 14 +- cmd/reasonix/main_test.go | 6 +- desktop/README.md | 6 +- desktop/cmd/sign/main.go | 6 +- desktop/cmd/sign/main_test.go | 2 +- desktop/cmd/studio-manifest/arch_gate_test.go | 2 +- desktop/cmd/studio-manifest/main.go | 2 +- desktop/cmd/studio-manifest/main_test.go | 2 +- desktop/cmd/update-helper/main_linux.go | 2 +- desktop/cmd/update-helper/main_linux_test.go | 2 +- desktop/cmd/update-helper/main_windows.go | 4 +- .../cmd/update-helper/main_windows_test.go | 6 +- desktop/cmd/update-helper/release_unit.go | 4 +- .../cmd/update-helper/release_unit_test.go | 6 +- .../cmd/update-helper/versioned_windows.go | 4 +- .../update-helper/versioned_windows_test.go | 6 +- desktop/frontend-next/perf/README.md | 2 +- desktop/frontend-next/perf/i18n.mjs | 2 +- desktop/frontend-next/src/i18n/index.ts | 2 +- desktop/frontend-next/src/port/hub.ts | 2 +- desktop/frontend-next/src/port/mock_mcp.ts | 4 +- desktop/frontend-next/src/port/session.ts | 8 +- desktop/frontend-next/src/port/tokens.ts | 2 +- desktop/frontend-next/src/port/wire.ts | 4 +- desktop/frontend-next/src/state/graph.ts | 2 +- desktop/frontend-next/src/state/say.test.ts | 2 +- desktop/frontend-next/src/state/session.ts | 2 +- desktop/frontend-next/src/ui/theme.ts | 2 +- docs/EXTENSIONS.md | 2 +- docs/EXTENSION_PROTOCOL.generated.md | 2 +- docs/EXTENSION_PROTOCOL.md | 2 +- docs/EXTENSION_RUNTIME_V2_PERF.md | 10 +- docs/REASONING_PROVIDERS.md | 2 +- docs/SPEC.md | 20 +- docs/STUDIO_SHELL_BOUNDARIES.md | 4 +- docs/THEME_PACK.md | 2 +- docs/TOOL_CONTRACT.md | 4 +- internal/{ => assembly}/boot/ablation_test.go | 4 +- .../{ => assembly}/boot/add_dir_root_test.go | 0 .../boot/agent_graph_effect_test.go | 4 +- internal/{ => assembly}/boot/agent_preset.go | 8 +- .../boot/anthropic_contract_test.go | 4 +- .../{ => assembly}/boot/assembly_reuse.go | 22 +- .../boot/assembly_reuse_test.go | 2 +- .../boot/audit_forwarding_test.go | 14 +- .../boot/authority_boundary_test.go | 6 +- .../boot/authority_provenance_test.go | 4 +- .../boot/bash_steer_surface_test.go | 2 +- internal/{ => assembly}/boot/boot.go | 66 +- .../boot/boot_safe_mode_test.go | 6 +- internal/{ => assembly}/boot/boot_test.go | 42 +- internal/{ => assembly}/boot/browser.go | 10 +- .../boot/browser_rebuild_test.go | 4 +- .../boot/capability_discovery_effect_test.go | 6 +- .../boot/catalog_host_effect_test.go | 6 +- .../boot/coalesce_wiring_test.go | 4 +- .../{ => assembly}/boot/compaction_budgets.go | 4 +- .../boot/compaction_retention_effect_test.go | 4 +- .../{ => assembly}/boot/compress_tool_test.go | 4 +- internal/{ => assembly}/boot/computer.go | 10 +- .../{ => assembly}/boot/config_home_test.go | 4 +- .../boot/context_budget_effect_test.go | 6 +- .../boot/context_projection_test.go | 14 +- .../boot/costquote_order_test.go | 6 +- .../{ => assembly}/boot/costquote_wiring.go | 8 +- .../boot/credential_read_test.go | 6 +- .../boot/deepseek_protocol_migration.go | 2 +- .../boot/deepseek_protocol_migration_test.go | 6 +- .../boot/delegation_audit_effect_test.go | 4 +- .../boot/delegation_identity_effect_test.go | 2 +- .../boot/delegation_matrix_test.go | 20 +- .../{ => assembly}/boot/delegation_tools.go | 4 +- .../{ => assembly}/boot/doctor_runtime.go | 2 +- .../boot/effect_browser_test.go | 8 +- .../boot/effect_cache_tail_test.go | 6 +- .../boot/effect_computer_test.go | 6 +- .../boot/effect_extension_tool_test.go | 6 +- internal/{ => assembly}/boot/effect_test.go | 16 +- .../boot/effect_tool_images_test.go | 6 +- .../boot/extension_dispatch_test.go | 6 +- .../boot/extension_firstboot_test.go | 14 +- .../boot/extension_provider_test.go | 6 +- .../boot/extension_sidecar_test.go | 10 +- .../{ => assembly}/boot/extension_tools.go | 6 +- .../boot/extension_ui_gate_test.go | 2 +- .../{ => assembly}/boot/extension_ui_test.go | 6 +- .../{ => assembly}/boot/generation_test.go | 2 +- .../boot/goal_contract_effect_test.go | 4 +- .../boot/goal_tool_surface_test.go | 4 +- .../boot/golden_baseline_test.go | 10 +- .../{ => assembly}/boot/healthy_config.go | 2 +- .../boot/healthy_config_test.go | 2 +- internal/{ => assembly}/boot/helper_test.go | 0 .../boot/home_stated_effect_test.go | 6 +- internal/{ => assembly}/boot/hook_notice.go | 4 +- .../{ => assembly}/boot/install_source.go | 10 +- .../boot/install_source_contract_test.go | 2 +- .../boot/instructions_projection_test.go | 4 +- .../boot/integration_matrix_test.go | 6 +- .../boot/integration_plan_test.go | 4 +- internal/{ => assembly}/boot/kimi_k3_test.go | 4 +- internal/{ => assembly}/boot/main_test.go | 2 +- internal/{ => assembly}/boot/mcp_specs.go | 6 +- internal/{ => assembly}/boot/memoryset.go | 6 +- .../{ => assembly}/boot/model_error_test.go | 8 +- internal/{ => assembly}/boot/options.go | 26 +- internal/{ => assembly}/boot/phasetimer.go | 0 .../{ => assembly}/boot/pidprobe_unix_test.go | 0 .../boot/pidprobe_windows_test.go | 0 .../boot/planner_missing_test.go | 4 +- .../boot/planner_override_test.go | 4 +- internal/{ => assembly}/boot/pluginspec.go | 8 +- .../boot/prefix_boundary_effect_test.go | 6 +- internal/{ => assembly}/boot/prompt.go | 18 +- internal/{ => assembly}/boot/prompt_policy.go | 2 +- .../boot/prompt_stability_test.go | 2 +- .../{ => assembly}/boot/provider_config.go | 6 +- .../{ => assembly}/boot/rebuild_graph_test.go | 4 +- .../{ => assembly}/boot/rebuild_subgraph.go | 16 +- internal/{ => assembly}/boot/reload.go | 8 +- .../{ => assembly}/boot/render_root_test.go | 4 +- internal/{ => assembly}/boot/report.go | 2 +- internal/{ => assembly}/boot/report_test.go | 0 internal/{ => assembly}/boot/resolver.go | 12 +- .../boot/resolver_remote_test.go | 4 +- .../boot/review_obligation_test.go | 16 +- .../boot/review_provenance_test.go | 6 +- internal/{ => assembly}/boot/runtime.go | 24 +- internal/{ => assembly}/boot/runtime_owner.go | 2 +- .../{ => assembly}/boot/runtime_owner_test.go | 4 +- internal/{ => assembly}/boot/runtime_plan.go | 10 +- .../{ => assembly}/boot/runtime_plan_test.go | 10 +- internal/{ => assembly}/boot/runtime_test.go | 4 +- .../{ => assembly}/boot/schema_budget_test.go | 6 +- internal/{ => assembly}/boot/scope_wire.go | 8 +- .../{ => assembly}/boot/session_observer.go | 4 +- .../{ => assembly}/boot/session_runtime.go | 12 +- .../boot/session_temp_rebuild_test.go | 6 +- internal/{ => assembly}/boot/side_models.go | 12 +- .../boot/skill_activation_test.go | 8 +- .../boot/skill_catalog_effect_test.go | 6 +- .../boot/skill_execution_owner_test.go | 16 +- .../{ => assembly}/boot/skill_subagent.go | 14 +- internal/{ => assembly}/boot/skills.go | 4 +- internal/{ => assembly}/boot/status_text.go | 2 +- .../boot/stream_router_stage_test.go | 8 +- .../{ => assembly}/boot/subagent_ablation.go | 6 +- .../boot/subagent_ablation_test.go | 6 +- .../boot/subagent_cleanup_recovery_test.go | 4 +- .../{ => assembly}/boot/subagent_config.go | 10 +- .../boot/subagent_model_test.go | 10 +- .../boot/superseded_effect_test.go | 4 +- .../boot/switch_reuse_effect_test.go | 4 +- .../boot/system_prompt_file_test.go | 2 +- internal/{ => assembly}/boot/systemone.go | 8 +- internal/{ => assembly}/boot/task_budget.go | 4 +- .../{ => assembly}/boot/task_budget_test.go | 2 +- .../{ => assembly}/boot/temphelper_test.go | 2 +- .../boot/testdata/golden/prefix_shape.json | 0 .../testdata/golden/provider_request.json | 0 .../boot/testdata/golden/system_prompt.txt | 0 .../boot/testdata/golden/tool_schemas.json | 0 internal/{ => assembly}/boot/token_profile.go | 0 .../boot/tool_contract_surface_test.go | 2 +- .../{ => assembly}/boot/tool_issuer_test.go | 4 +- internal/{ => assembly}/boot/triage.go | 6 +- .../{ => assembly}/boot/turn_exit_tools.go | 4 +- .../boot/usage_record_effect_test.go | 10 +- .../boot/use_capability_surface_test.go | 6 +- .../{ => assembly}/boot/window_posture.go | 6 +- .../{ => assembly}/boot/work_practice_test.go | 2 +- internal/{ => assembly}/boot/workspace.go | 0 .../boot/workspace_lease_effect_test.go | 6 +- .../boot/workspace_root_test.go | 0 .../{ => assembly}/boot/zz_probe3_test.go | 4 +- internal/{ => base}/diff/diff.go | 0 internal/{ => base}/diff/diff_extra_test.go | 0 internal/{ => base}/diff/diff_test.go | 0 internal/{ => base}/diff/largediff_test.go | 0 internal/{ => base}/filelock/filelock.go | 0 internal/{ => base}/filelock/filelock_test.go | 2 +- internal/{ => base}/filelock/lock_unix.go | 0 internal/{ => base}/filelock/lock_windows.go | 0 internal/{ => base}/fileref/search.go | 0 internal/{ => base}/fileref/search_test.go | 2 +- internal/{ => base}/fileref/skip_test.go | 2 +- internal/{ => base}/fileutil/atomicwrite.go | 0 .../{ => base}/fileutil/atomicwrite_test.go | 2 +- internal/{ => base}/fileutil/containment.go | 0 .../{ => base}/fileutil/containment_test.go | 0 .../{ => base}/fileutil/encoding/encoding.go | 0 .../fileutil/encoding/encoding_test.go | 2 +- .../encoding/trim_partial_rune_test.go | 0 .../fileutil/replacefallback_other.go | 0 .../fileutil/replacefallback_windows.go | 0 .../fileutil/replacefallback_windows_test.go | 0 internal/{ => base}/fileutil/rootname.go | 0 internal/{ => base}/fileutil/rootname_test.go | 0 internal/{ => base}/fileutil/slashglob.go | 0 .../{ => base}/fileutil/slashglob_test.go | 0 internal/{ => base}/fileutil/vcs.go | 0 internal/{ => base}/frontmatter/document.go | 0 .../{ => base}/frontmatter/document_test.go | 0 .../{ => base}/frontmatter/frontmatter.go | 0 .../frontmatter/frontmatter_test.go | 0 internal/{ => base}/frontmatter/list_test.go | 0 internal/{ => base}/gitignore/excludes.go | 0 internal/{ => base}/gitignore/gitignore.go | 0 .../{ => base}/gitignore/gitignore_test.go | 4 +- .../{ => base}/i18n/catalog_parity_test.go | 0 internal/{ => base}/i18n/catalog_test.go | 0 internal/{ => base}/i18n/i18n.go | 0 internal/{ => base}/i18n/i18n_test.go | 0 internal/{ => base}/i18n/messages_en.go | 0 internal/{ => base}/i18n/messages_zh.go | 0 internal/{ => base}/i18n/messages_zh_tw.go | 0 internal/{ => base}/i18n/oslang_other.go | 0 internal/{ => base}/i18n/oslang_windows.go | 0 internal/{ => base}/netclient/diagnose.go | 0 .../{ => base}/netclient/diagnose_test.go | 0 internal/{ => base}/netclient/dialer.go | 0 internal/{ => base}/netclient/netclient.go | 2 +- .../{ => base}/netclient/netclient_test.go | 0 internal/{ => base}/neterr/errno_unix.go | 0 internal/{ => base}/neterr/errno_windows.go | 0 internal/{ => base}/neterr/neterr.go | 0 internal/{ => base}/neterr/neterr_test.go | 0 internal/{ => base}/nilutil/nil.go | 0 internal/{ => base}/nilutil/nil_test.go | 0 internal/{ => base}/proc/hide_other.go | 0 internal/{ => base}/proc/hide_other_test.go | 0 internal/{ => base}/proc/hide_windows.go | 0 internal/{ => base}/proc/hide_windows_test.go | 0 internal/{ => base}/proc/kill_other.go | 0 internal/{ => base}/proc/kill_other_test.go | 0 internal/{ => base}/proc/kill_windows.go | 0 internal/{ => base}/proc/kill_windows_test.go | 0 internal/{ => base}/proc/priority_other.go | 0 internal/{ => base}/proc/priority_windows.go | 0 .../{ => base}/proc/priority_windows_test.go | 0 internal/{ => base}/proc/run.go | 0 internal/{ => base}/proc/run_test.go | 0 .../{ => base}/proc/shell_path_probe_other.go | 0 .../proc/shell_path_probe_windows.go | 0 internal/{ => base}/proc/tracked.go | 0 internal/{ => base}/proc/tracked_test.go | 0 internal/{ => base}/proc/tree_other.go | 0 internal/{ => base}/proc/tree_windows.go | 0 internal/{ => base}/proc/tree_windows_test.go | 0 internal/{ => base}/retrieval/bm25.go | 0 internal/{ => base}/retrieval/bm25_test.go | 0 internal/{ => base}/retrieval/v2.go | 0 internal/{ => base}/retrieval/v2_test.go | 0 internal/{ => base}/secrets/credpaths.go | 0 internal/{ => base}/secrets/credpaths_test.go | 0 internal/{ => base}/secrets/redact.go | 2 +- internal/{ => base}/secrets/redact_test.go | 2 +- internal/{ => base}/shellparse/bash.go | 0 internal/{ => base}/shellparse/bash_test.go | 0 internal/{ => base}/shellparse/exit_status.go | 0 internal/{ => base}/shellparse/heredoc.go | 0 .../shellparse/heredoc_scope_test.go | 0 internal/{ => base}/shellparse/mask_test.go | 0 internal/{ => base}/shellparse/pipeline.go | 0 .../{ => base}/shellparse/pipeline_test.go | 0 internal/{ => base}/sysproxy/sysproxy.go | 0 internal/{ => base}/sysproxy/sysproxy_test.go | 0 internal/{ => base}/sysproxy/system_other.go | 0 .../{ => base}/sysproxy/system_windows.go | 0 internal/{ => base}/tempdir/refusal_other.go | 0 .../{ => base}/tempdir/refusal_windows.go | 0 .../tempdir/refusal_windows_test.go | 0 internal/{ => base}/tempdir/tempdir.go | 0 internal/{ => base}/tempdir/tempdir_test.go | 0 internal/{ => base}/testenv/budget.go | 0 internal/{ => base}/testenv/home.go | 0 internal/{ => base}/testenv/home_test.go | 0 internal/{ => base}/testenv/tempdir.go | 0 internal/{ => base}/textutil/bytes.go | 0 internal/{ => base}/textutil/display.go | 0 internal/{ => base}/textutil/grapheme.go | 0 internal/{ => base}/textutil/grapheme_test.go | 0 internal/{ => base}/tokencount/tokencount.go | 0 .../{ => base}/tokencount/tokencount_test.go | 0 .../{ => base}/workspaceid/workspaceid.go | 0 .../workspaceid/workspaceid_test.go | 2 +- internal/{ => contract}/ablation/ablation.go | 0 .../{ => contract}/ablation/ablation_test.go | 0 internal/{ => contract}/agentgraph/doc.go | 0 internal/{ => contract}/agentgraph/graph.go | 0 .../{ => contract}/agentgraph/graph_test.go | 0 .../{ => contract}/agentpreset/matrix_test.go | 4 +- internal/{ => contract}/agentpreset/policy.go | 0 internal/{ => contract}/agentpreset/preset.go | 0 .../{ => contract}/agentpreset/preset_test.go | 0 .../{ => contract}/config/activation_mcp.go | 0 .../{ => contract}/config/activation_skill.go | 0 .../config/activation_trust_test.go | 0 .../config/agent_roundtrip_test.go | 2 +- .../config/anthropic_contract.go | 4 +- internal/{ => contract}/config/apikeyenv.go | 0 .../{ => contract}/config/apikeyenv_test.go | 0 .../config/appearance_round_trip_test.go | 2 +- .../{ => contract}/config/backfill_test.go | 4 +- internal/{ => contract}/config/billing.go | 4 +- .../{ => contract}/config/billing_test.go | 4 +- .../config/billing_upgrade_test.go | 2 +- .../config/bounded_component_test.go | 0 .../{ => contract}/config/bringforward.go | 0 internal/{ => contract}/config/browser.go | 0 .../{ => contract}/config/cache_policy.go | 0 .../config/cache_policy_test.go | 0 .../config/capability_activation.go | 8 +- .../config/capability_activation_test.go | 4 +- .../config/capability_errors.go | 0 internal/{ => contract}/config/ccswitch.go | 4 +- .../{ => contract}/config/ccswitch_test.go | 2 +- internal/{ => contract}/config/chat_model.go | 0 .../{ => contract}/config/chat_model_test.go | 0 internal/{ => contract}/config/claudejson.go | 2 +- .../{ => contract}/config/claudejson_test.go | 0 .../config/cli_update_channel_test.go | 2 +- .../{ => contract}/config/commanddirs_test.go | 0 internal/{ => contract}/config/config.go | 6 +- .../{ => contract}/config/configured_test.go | 0 internal/{ => contract}/config/credentials.go | 4 +- .../config/credentials_keyring_default.go | 0 .../config/credentials_keyring_helper.go | 0 .../credentials_keyring_timeout_test.go | 2 +- .../config/credentials_keyring_unix.go | 0 .../config/credentials_location_test.go | 2 +- .../{ => contract}/config/curated_models.go | 0 internal/{ => contract}/config/decode.go | 2 +- .../config/deepseek_canonical.go | 2 +- .../{ => contract}/config/deepseek_catalog.go | 2 +- .../config/deepseek_catalog_test.go | 2 +- .../config/deepseek_peer_fold_test.go | 2 +- .../{ => contract}/config/deepseek_presets.go | 0 .../config/deepseek_protocol_migration.go | 4 +- .../deepseek_protocol_migration_test.go | 4 +- .../config/deepseek_vision_fold.go | 0 .../config/deepseek_vision_fold_test.go | 4 +- .../{ => contract}/config/default_test.go | 0 .../config/delivery_paths_test.go | 2 +- .../{ => contract}/config/desktop_config.go | 0 internal/{ => contract}/config/desktop_pin.go | 0 .../config/desktop_roundtrip_test.go | 0 internal/{ => contract}/config/dotenv.go | 2 +- internal/{ => contract}/config/dotenv_test.go | 4 +- internal/{ => contract}/config/edit.go | 12 +- .../{ => contract}/config/edit_compaction.go | 0 internal/{ => contract}/config/edit_shell.go | 0 internal/{ => contract}/config/edit_test.go | 4 +- internal/{ => contract}/config/effort.go | 2 +- .../config/effort_gpt56_test.go | 0 .../{ => contract}/config/effort_mimo_test.go | 0 .../{ => contract}/config/effort_protocol.go | 0 internal/{ => contract}/config/effort_test.go | 0 .../config/effort_vendor_host_test.go | 0 .../config/environment_config.go | 0 .../config/environment_render_test.go | 0 internal/{ => contract}/config/expand.go | 0 internal/{ => contract}/config/expand_test.go | 2 +- internal/{ => contract}/config/fetch.go | 2 +- internal/{ => contract}/config/fetch_test.go | 0 .../{ => contract}/config/kimi_k3_test.go | 2 +- .../{ => contract}/config/legacy_providers.go | 0 internal/{ => contract}/config/lkg.go | 0 .../config/lkg_provenance_test.go | 2 +- internal/{ => contract}/config/lkg_test.go | 2 +- internal/{ => contract}/config/load.go | 6 +- .../config/load_project_default_test.go | 2 +- .../{ => contract}/config/loadedit_test.go | 4 +- internal/{ => contract}/config/lsp.go | 0 internal/{ => contract}/config/main_test.go | 2 +- internal/{ => contract}/config/mcp_command.go | 2 +- .../config/mcp_concurrency_round_trip_test.go | 0 internal/{ => contract}/config/mcpjson.go | 4 +- .../{ => contract}/config/mcpjson_test.go | 4 +- internal/{ => contract}/config/migrate.go | 2 +- .../config/migrate_hooks_test.go | 2 +- .../{ => contract}/config/migrate_test.go | 2 +- .../config/model_fallback_test.go | 0 .../{ => contract}/config/model_window.go | 0 .../config/model_window_test.go | 0 internal/{ => contract}/config/mutate.go | 2 +- internal/{ => contract}/config/mutate_test.go | 2 +- .../config/official_pricing_test.go | 4 +- internal/{ => contract}/config/passthrough.go | 0 .../{ => contract}/config/passthrough_test.go | 2 +- internal/{ => contract}/config/path_access.go | 0 .../config/path_isolation_test.go | 2 +- internal/{ => contract}/config/paths.go | 6 +- .../{ => contract}/config/plugin_entry.go | 0 .../{ => contract}/config/plugin_packages.go | 4 +- .../config/plugin_packages_test.go | 6 +- internal/{ => contract}/config/policies.go | 0 .../{ => contract}/config/preset_upgrade.go | 0 internal/{ => contract}/config/pricing.go | 4 +- internal/{ => contract}/config/probe.go | 0 .../{ => contract}/config/probe_failure.go | 2 +- internal/{ => contract}/config/probe_key.go | 0 internal/{ => contract}/config/probe_test.go | 0 internal/{ => contract}/config/protocol.go | 0 .../config/protocol_declared.go | 2 +- .../config/protocol_declared_test.go | 2 +- .../{ => contract}/config/protocol_test.go | 10 +- .../config/provider_isolation_test.go | 2 +- .../config/provider_model_rename.go | 0 .../{ => contract}/config/provider_presets.go | 2 +- .../config/provider_presets_opencode_go.go | 0 .../config/provider_presets_test.go | 0 internal/{ => contract}/config/proxy_test.go | 0 .../config/reasoning_display.go | 0 .../config/reasoning_display_test.go | 0 internal/{ => contract}/config/remote.go | 0 .../config/remote_config_test.go | 2 +- .../config/remote_credentials.go | 0 internal/{ => contract}/config/render.go | 4 +- .../config/render_delegation.go | 0 .../{ => contract}/config/render_desktop.go | 0 .../{ => contract}/config/render_memory.go | 0 .../{ => contract}/config/render_plugin.go | 0 .../{ => contract}/config/render_remote.go | 0 internal/{ => contract}/config/render_test.go | 2 +- .../config/responses_continuation.go | 0 .../{ => contract}/config/retired_keys.go | 4 +- internal/{ => contract}/config/roles.go | 0 .../{ => contract}/config/safe_mode_test.go | 2 +- .../{ => contract}/config/sandbox_test.go | 0 internal/{ => contract}/config/skill_name.go | 0 .../config/state_root_entries_test.go | 2 +- .../{ => contract}/config/storage_config.go | 2 +- .../{ => contract}/config/storage_roots.go | 0 .../config/storage_roots_test.go | 2 +- .../config/subagent_model_test.go | 0 .../config/system_prompt_test.go | 4 +- internal/{ => contract}/config/systemone.go | 0 .../config/systemone_migrate.go | 2 +- .../config/systemone_migrate_test.go | 0 .../{ => contract}/config/systemone_test.go | 0 .../{ => contract}/config/systemprompt.go | 2 +- .../{ => contract}/config/telemetry_test.go | 2 +- .../{ => contract}/config/thinking_params.go | 0 .../{ => contract}/config/toml_assignment.go | 0 internal/{ => contract}/config/tools_test.go | 0 internal/{ => contract}/config/unparsed.go | 2 +- .../{ => contract}/config/unparsed_test.go | 2 +- internal/{ => contract}/config/vision.go | 2 +- .../{ => contract}/config/vision_offer.go | 0 internal/{ => contract}/config/vision_test.go | 0 internal/{ => contract}/config/web_search.go | 0 .../{ => contract}/config/web_search_test.go | 2 +- .../config/workspace_slug_test.go | 0 .../{ => contract}/event/audit_forwarder.go | 4 +- internal/{ => contract}/event/bound.go | 0 .../{ => contract}/event/cache_diagnostics.go | 0 internal/{ => contract}/event/coalesce.go | 4 +- .../{ => contract}/event/coalesce_test.go | 2 +- internal/{ => contract}/event/completion.go | 0 .../{ => contract}/event/costquote_sink.go | 4 +- .../event/costquote_sink_test.go | 2 +- internal/{ => contract}/event/event.go | 8 +- internal/{ => contract}/event/event_test.go | 4 +- internal/{ => contract}/event/extension.go | 0 internal/{ => contract}/event/notice_codes.go | 0 .../event/project_check_probe.go | 2 +- internal/{ => contract}/event/receipt.go | 0 internal/{ => contract}/event/receipt_test.go | 0 internal/{ => contract}/event/record.go | 4 +- internal/{ => contract}/event/run_budget.go | 2 +- .../{ => contract}/event/sink_capabilities.go | 0 .../event/sink_capabilities_test.go | 2 +- .../{ => contract}/event/subagent_handoff.go | 2 +- .../{ => contract}/event/subagent_progress.go | 0 internal/{ => contract}/event/sync.go | 6 +- internal/{ => contract}/event/tool_cost.go | 2 +- internal/{ => contract}/event/tool_issuer.go | 0 .../event/verification_drift.go | 2 +- .../{ => contract}/event/workspace_lease.go | 0 .../event/workspace_mutation.go | 2 +- .../{ => contract}/eventwire/attribution.go | 2 +- .../eventwire/costquote_compat_test.go | 6 +- .../{ => contract}/eventwire/extension.go | 2 +- .../eventwire/frontend_contract_test.go | 2 +- internal/{ => contract}/eventwire/receipt.go | 2 +- internal/{ => contract}/eventwire/wire.go | 8 +- .../eventwire/wire_extension_test.go | 2 +- .../{ => contract}/eventwire/wire_test.go | 10 +- .../eventwire/workspace_lease.go | 2 +- internal/{ => contract}/plancontract/diff.go | 0 .../{ => contract}/plancontract/diff_test.go | 0 internal/{ => contract}/plancontract/doc.go | 0 internal/{ => contract}/plancontract/order.go | 0 .../{ => contract}/plancontract/order_test.go | 0 internal/{ => contract}/plancontract/plan.go | 0 .../{ => contract}/plancontract/plan_test.go | 0 .../{ => contract}/plancontract/project.go | 2 +- .../plancontract/project_test.go | 2 +- .../{ => contract}/plancontract/render.go | 0 .../plancontract/render_test.go | 14 +- internal/{ => contract}/planmode/context.go | 0 .../{ => contract}/planmode/marker_test.go | 0 internal/{ => contract}/planmode/policy.go | 0 .../{ => contract}/planmode/policy_test.go | 0 .../{ => contract}/planmode/reconcile_test.go | 6 +- internal/{ => contract}/planmode/state.go | 0 .../{ => contract}/planmode/state_test.go | 0 internal/{ => contract}/provider/chunk.go | 0 internal/{ => contract}/provider/config.go | 0 .../provider/context_overflow.go | 0 .../provider/context_overflow_test.go | 0 .../provider/endpoint_anthropic.go | 0 .../{ => contract}/provider/image_data_url.go | 0 .../{ => contract}/provider/image_test.go | 0 .../{ => contract}/provider/local_metadata.go | 0 .../{ => contract}/provider/output_budget.go | 0 .../provider/pairing_probe_test.go | 0 .../{ => contract}/provider/projection.go | 0 internal/{ => contract}/provider/provider.go | 2 +- .../{ => contract}/provider/provider_test.go | 0 internal/{ => contract}/provider/resolver.go | 0 internal/{ => contract}/provider/retry.go | 0 .../{ => contract}/provider/retry_test.go | 0 .../provider/schema_canonicalize.go | 0 .../provider/schema_canonicalize_test.go | 0 .../{ => contract}/provider/schema_dialect.go | 0 .../provider/schema_dialect_test.go | 0 .../{ => contract}/provider/schema_error.go | 0 .../provider/schema_error_test.go | 0 .../provider/schema_validate.go | 0 .../provider/schema_validate_test.go | 2 +- .../{ => contract}/provider/stream_error.go | 0 .../provider/stream_error_test.go | 0 .../provider/stream_interrupt_test.go | 0 .../{ => contract}/provider/stream_payload.go | 0 .../provider/streaminterrupt.go | 2 +- .../provider/tool_execution_cache_test.go | 0 internal/{ => contract}/provider/usage.go | 0 internal/{ => contract}/surface/surface.go | 0 .../{ => contract}/surface/surface_test.go | 0 internal/{ => contract}/taskcontract/proof.go | 2 +- .../{ => contract}/taskcontract/proof_test.go | 2 +- .../taskcontract/taskcontract.go | 2 +- .../taskcontract/taskcontract_test.go | 2 +- internal/{ => contract}/tool/blocked.go | 0 internal/{ => contract}/tool/compress.go | 0 internal/{ => contract}/tool/configwrite.go | 0 .../{ => contract}/tool/context_budget.go | 0 .../tool/contextual_reason_test.go | 4 +- internal/{ => contract}/tool/contract.go | 2 +- .../{ => contract}/tool/contract_lock_test.go | 0 internal/{ => contract}/tool/contract_test.go | 10 +- internal/{ => contract}/tool/goal.go | 0 internal/{ => contract}/tool/goal_test.go | 0 .../{ => contract}/tool/permission_args.go | 0 internal/{ => contract}/tool/preview_test.go | 2 +- internal/{ => contract}/tool/progress.go | 0 .../tool/provider_surface_test.go | 2 +- internal/{ => contract}/tool/recall.go | 0 internal/{ => contract}/tool/refusal.go | 0 .../tool/registry_canon_test.go | 0 internal/{ => contract}/tool/registry_test.go | 0 internal/{ => contract}/tool/resolved.go | 0 .../{ => contract}/tool/shell_execution.go | 0 internal/{ => contract}/tool/subagentguard.go | 2 +- internal/{ => contract}/tool/tool.go | 4 +- internal/{ => ext}/command/command.go | 6 +- .../{ => ext}/command/command_extra_test.go | 2 +- internal/{ => ext}/command/command_test.go | 4 +- internal/{ => ext}/command/inspect.go | 0 internal/{ => ext}/command/slashtool.go | 2 +- internal/{ => ext}/command/slashtool_test.go | 2 +- internal/{ => ext}/command/symlink_test.go | 2 +- internal/{ => ext}/extension/adapters.go | 12 +- .../extension/bench_threshold_test.go | 0 .../{ => ext}/extension/benchmark_test.go | 2 +- internal/{ => ext}/extension/builder.go | 6 +- internal/{ => ext}/extension/builder_test.go | 2 +- internal/{ => ext}/extension/catalog.go | 0 internal/{ => ext}/extension/catalog_test.go | 2 +- .../{ => ext}/extension/component_status.go | 0 .../extension/conflict_collect_test.go | 0 .../extension/conformance/conformance_test.go | 12 +- .../conformance/installed_fixture_test.go | 10 +- .../extension/conformance/raw_test.go | 4 +- internal/{ => ext}/extension/contributor.go | 0 internal/{ => ext}/extension/dependency.go | 2 +- .../{ => ext}/extension/dependency_test.go | 2 +- .../extension/dispatch/benchmark_test.go | 4 +- .../{ => ext}/extension/dispatch/dispatch.go | 6 +- .../extension/dispatch/dispatch_test.go | 8 +- .../{ => ext}/extension/dispatch/fake_test.go | 2 +- .../{ => ext}/extension/dispatch/payloads.go | 4 +- internal/{ => ext}/extension/doc.go | 6 +- internal/{ => ext}/extension/effectscope.go | 0 .../{ => ext}/extension/effectscope_test.go | 0 .../{ => ext}/extension/file_compensate.go | 0 .../extension/file_compensate_test.go | 2 +- .../extension/golden_fixtures_test.go | 2 +- internal/{ => ext}/extension/host_stream.go | 0 .../{ => ext}/extension/host_stream_test.go | 0 internal/{ => ext}/extension/intercept.go | 0 .../{ => ext}/extension/intercept_test.go | 0 internal/{ => ext}/extension/lifecycle.go | 0 .../{ => ext}/extension/manifest_sync_test.go | 4 +- internal/{ => ext}/extension/mcpproxy.go | 0 internal/{ => ext}/extension/mcpproxy_test.go | 0 internal/{ => ext}/extension/message_dedup.go | 0 .../{ => ext}/extension/message_dedup_test.go | 0 internal/{ => ext}/extension/metrics.go | 0 internal/{ => ext}/extension/metrics_test.go | 0 .../extension/protocol/dto_content.go | 0 .../extension/protocol/dto_intercept.go | 0 .../extension/protocol/dto_lifecycle.go | 0 .../extension/protocol/dto_provider.go | 4 +- .../{ => ext}/extension/protocol/dto_test.go | 0 .../{ => ext}/extension/protocol/dto_tool.go | 0 .../{ => ext}/extension/protocol/dto_ui.go | 0 .../{ => ext}/extension/protocol/dto_view.go | 0 .../extension/protocol/dto_view_test.go | 0 .../{ => ext}/extension/protocol/enums.go | 4 +- .../{ => ext}/extension/protocol/errors.go | 2 +- .../extension/protocol/errors_test.go | 2 +- .../{ => ext}/extension/protocol/limits.go | 0 .../{ => ext}/extension/protocol/protocol.go | 0 .../extension/protocol/protocol_test.go | 0 .../{ => ext}/extension/protocol/registry.go | 0 .../extension/protocol/registry_test.go | 0 .../extension/protocol/schema.generated.json | 0 .../{ => ext}/extension/protocol/schema.go | 0 .../protocol/schema_hash.generated.go | 0 .../extension/protocol/schema_test.go | 0 .../{ => ext}/extension/protocol/validate.go | 0 .../extension/protocolgen/generate.go | 6 +- .../extension/protocolgen/generate_test.go | 4 +- .../{ => ext}/extension/protocolgen/sdkgo.go | 4 +- .../extension/providerconv/providerconv.go | 10 +- .../providerconv/providerconv_test.go | 4 +- .../extension/providerext/provider.go | 6 +- .../extension/providerext/providerext.go | 12 +- .../extension/providerext/providerext_test.go | 6 +- .../{ => ext}/extension/providerext/stream.go | 8 +- .../providerext/stream_lifecycle_test.go | 4 +- .../extension/providerext/stream_test.go | 4 +- internal/{ => ext}/extension/proxy.go | 0 internal/{ => ext}/extension/proxy_test.go | 0 internal/{ => ext}/extension/publish.go | 0 internal/{ => ext}/extension/publish_test.go | 0 internal/{ => ext}/extension/receipt_store.go | 0 .../{ => ext}/extension/receipt_store_test.go | 0 .../{ => ext}/extension/recovery_policy.go | 0 .../extension/recovery_policy_test.go | 0 internal/{ => ext}/extension/replace.go | 2 +- internal/{ => ext}/extension/replace_test.go | 0 .../{ => ext}/extension/rpcwire/bootstrap.go | 0 .../extension/rpcwire/bootstrap_test.go | 0 internal/{ => ext}/extension/rpcwire/conn.go | 0 .../rpcwire/conn_strict_regression_test.go | 0 .../{ => ext}/extension/rpcwire/conn_test.go | 0 .../{ => ext}/extension/rpcwire/errors.go | 0 .../{ => ext}/extension/rpcwire/framing.go | 0 .../{ => ext}/extension/rpcwire/stall_test.go | 0 internal/{ => ext}/extension/runtime_owner.go | 0 .../{ => ext}/extension/runtime_owner_test.go | 2 +- internal/{ => ext}/extension/runtimeplan.go | 2 +- .../extension/runtimeplan_classify_test.go | 2 +- .../{ => ext}/extension/runtimeplan_test.go | 2 +- internal/{ => ext}/extension/runtimeset.go | 0 .../{ => ext}/extension/runtimeset_test.go | 0 .../{ => ext}/extension/scope_resources.go | 0 .../extension/scope_resources_test.go | 0 internal/{ => ext}/extension/sessionstate.go | 2 +- .../{ => ext}/extension/sessionstate_test.go | 2 +- .../extension/sidecar/benchmark_test.go | 6 +- .../{ => ext}/extension/sidecar/client.go | 12 +- .../extension/sidecar/client_test.go | 10 +- .../{ => ext}/extension/sidecar/content.go | 2 +- .../extension/sidecar/content_test.go | 2 +- internal/{ => ext}/extension/sidecar/doc.go | 0 .../extension/sidecar/externalize.go | 2 +- .../extension/sidecar/externalize_test.go | 4 +- .../{ => ext}/extension/sidecar/fake_test.go | 8 +- .../{ => ext}/extension/sidecar/manager.go | 8 +- .../extension/sidecar/manager_test.go | 8 +- .../extension/sidecar/nth_fail_test.go | 4 +- internal/{ => ext}/extension/sidecar/plan.go | 8 +- .../{ => ext}/extension/sidecar/plan_test.go | 2 +- .../extension/sidecar/probe_client.go | 2 +- .../{ => ext}/extension/sidecar/process.go | 12 +- .../extension/sidecar/process_test.go | 4 +- .../{ => ext}/extension/sidecar/provides.go | 4 +- .../extension/sidecar/stream_router_test.go | 4 +- internal/{ => ext}/extension/sidecar/tools.go | 4 +- .../{ => ext}/extension/sidecar/tools_test.go | 4 +- internal/{ => ext}/extension/snapshot.go | 6 +- .../{ => ext}/extension/snapshot_live_test.go | 2 +- internal/{ => ext}/extension/snapshot_test.go | 2 +- internal/{ => ext}/extension/source.go | 0 internal/{ => ext}/extension/stale.go | 0 .../lifecycle.states.golden.json | 0 .../spatiotemporal-v2/manifest.v2.golden.json | 0 internal/{ => ext}/extension/uihub/hub.go | 10 +- .../{ => ext}/extension/uihub/hub_test.go | 4 +- .../{ => ext}/extension/uihub/view_test.go | 4 +- .../{ => ext}/extensioncontract/capability.go | 0 .../extensioncontract/capability_test.go | 0 .../extensioncontract/providerref.go | 0 .../extensioncontract/providerref_test.go | 0 .../{ => ext}/hook/batch_command_other.go | 0 .../{ => ext}/hook/batch_command_windows.go | 0 internal/{ => ext}/hook/command_normalize.go | 2 +- internal/{ => ext}/hook/edit.go | 4 +- internal/{ => ext}/hook/edit_test.go | 2 +- internal/{ => ext}/hook/env_contract.go | 2 +- .../{ => ext}/hook/execution_contract_test.go | 2 +- internal/{ => ext}/hook/hook.go | 20 +- internal/{ => ext}/hook/hook_test.go | 8 +- internal/{ => ext}/hook/inspect.go | 4 +- internal/{ => ext}/hook/notice_repeat_test.go | 2 +- internal/{ => ext}/hook/posix_syntax.go | 2 +- internal/{ => ext}/hook/posix_syntax_test.go | 0 internal/{ => ext}/hook/runner.go | 0 internal/{ => ext}/hook/runner_test.go | 2 +- internal/{ => ext}/hook/windows_batch_test.go | 6 +- internal/{ => ext}/hook/windows_compat.go | 4 +- .../{ => ext}/hook/windows_posix_script.go | 2 +- .../hook/windows_posix_script_test.go | 4 +- internal/{ => ext}/installsource/apply.go | 4 +- internal/{ => ext}/installsource/archive.go | 0 .../{ => ext}/installsource/archive_test.go | 4 +- internal/{ => ext}/installsource/doc.go | 0 internal/{ => ext}/installsource/errors.go | 0 internal/{ => ext}/installsource/http.go | 0 .../{ => ext}/installsource/install_source.go | 8 +- .../installsource/install_source_test.go | 10 +- internal/{ => ext}/installsource/mcp.go | 4 +- internal/{ => ext}/installsource/names.go | 2 +- internal/{ => ext}/installsource/plan.go | 2 +- .../installsource/plan_ticket_test.go | 6 +- .../{ => ext}/installsource/plugin_package.go | 4 +- .../plugin_package_windows_test.go | 0 .../installsource/plugin_runtime_test.go | 2 +- internal/{ => ext}/installsource/skill.go | 8 +- internal/{ => ext}/installsource/ssrf.go | 2 +- internal/{ => ext}/installsource/tarball.go | 0 .../{ => ext}/installsource/tarball_test.go | 2 +- internal/{ => ext}/installsource/types.go | 4 +- internal/{ => ext}/mcpdiag/auth.go | 0 internal/{ => ext}/mcpdiag/auth_test.go | 0 internal/{ => ext}/mcplaunch/launch.go | 2 +- internal/{ => ext}/mcplaunch/launch_test.go | 2 +- internal/{ => ext}/mcplaunch/process_other.go | 0 internal/{ => ext}/mcplaunch/process_unix.go | 0 .../{ => ext}/mcplaunch/process_windows.go | 0 .../mcplaunch/process_windows_test.go | 0 internal/{ => ext}/mcpregistry/registry.go | 4 +- .../{ => ext}/mcpregistry/registry_test.go | 2 +- internal/{ => ext}/mcpsetup/argv.go | 2 +- internal/{ => ext}/mcpsetup/doc.go | 0 internal/{ => ext}/mcpsetup/parse.go | 2 +- internal/{ => ext}/mcpsetup/parse_test.go | 0 internal/{ => ext}/mcpsetup/secrets.go | 0 .../{ => ext}/plugin/aux_lifecycle_test.go | 0 internal/{ => ext}/plugin/cache.go | 8 +- internal/{ => ext}/plugin/cache_test.go | 8 +- internal/{ => ext}/plugin/cancellation.go | 0 internal/{ => ext}/plugin/canonicalize.go | 4 +- .../{ => ext}/plugin/canonicalize_test.go | 2 +- .../plugin/chrome_devtools_live_test.go | 8 +- internal/{ => ext}/plugin/client_close.go | 0 internal/{ => ext}/plugin/client_session.go | 2 +- internal/{ => ext}/plugin/codegraph_limit.go | 0 .../{ => ext}/plugin/codegraph_limit_test.go | 0 internal/{ => ext}/plugin/deferred_spawn.go | 0 internal/{ => ext}/plugin/example_test.go | 6 +- internal/{ => ext}/plugin/failures.go | 0 .../{ => ext}/plugin/failures_status_test.go | 0 .../{ => ext}/plugin/host_concurrency_test.go | 0 internal/{ => ext}/plugin/host_queries.go | 0 internal/{ => ext}/plugin/hotadd_test.go | 0 internal/{ => ext}/plugin/install.go | 0 .../{ => ext}/plugin/instructions_test.go | 0 internal/{ => ext}/plugin/known_overrides.go | 0 internal/{ => ext}/plugin/launcher_lock.go | 4 +- .../{ => ext}/plugin/launcher_lock_test.go | 4 +- internal/{ => ext}/plugin/lazy.go | 2 +- internal/{ => ext}/plugin/lazy_test.go | 6 +- internal/{ => ext}/plugin/main_test.go | 2 +- internal/{ => ext}/plugin/oauth.go | 4 +- internal/{ => ext}/plugin/oauth_helpers.go | 0 internal/{ => ext}/plugin/oauth_refresh.go | 0 .../plugin/oauth_refresh_semantics_test.go | 2 +- internal/{ => ext}/plugin/oauth_state.go | 4 +- internal/{ => ext}/plugin/oauth_test.go | 2 +- internal/{ => ext}/plugin/plugin.go | 12 +- internal/{ => ext}/plugin/plugin_test.go | 10 +- .../{ => ext}/plugin/process_mode_test.go | 4 +- internal/{ => ext}/plugin/prompts.go | 0 internal/{ => ext}/plugin/protocol_inbound.go | 2 +- internal/{ => ext}/plugin/proxy.go | 0 internal/{ => ext}/plugin/proxy_e2e_test.go | 8 +- internal/{ => ext}/plugin/proxy_test.go | 0 .../plugin/registration_journal_test.go | 0 .../{ => ext}/plugin/registration_scope.go | 0 internal/{ => ext}/plugin/resources.go | 0 internal/{ => ext}/plugin/security.go | 6 +- internal/{ => ext}/plugin/startup.go | 2 +- .../{ => ext}/plugin/startup_cause_test.go | 0 internal/{ => ext}/plugin/stats.go | 4 +- internal/{ => ext}/plugin/stats_test.go | 2 +- internal/{ => ext}/plugin/status.go | 2 +- internal/{ => ext}/plugin/status_sink_test.go | 2 +- .../{ => ext}/plugin/stdio_cancel_test.go | 4 +- internal/{ => ext}/plugin/toolresult_image.go | 2 +- .../{ => ext}/plugin/toolresult_image_test.go | 0 .../plugin/transport_concurrency_test.go | 0 internal/{ => ext}/plugin/transport_http.go | 4 +- .../plugin/transport_http_status_test.go | 0 .../{ => ext}/plugin/transport_http_test.go | 4 +- .../{ => ext}/plugin/transport_reconnect.go | 2 +- internal/{ => ext}/plugin/transport_sse.go | 2 +- .../{ => ext}/plugin/transport_sse_test.go | 4 +- internal/{ => ext}/plugin/transport_stdio.go | 8 +- .../plugin/transport_stdio_cache_test.go | 0 .../plugin/transport_stdio_dir_test.go | 4 +- .../plugin/transport_stdio_env_test.go | 6 +- .../plugin/transport_stdio_other_test.go | 0 .../plugin/transport_stdio_recovery_test.go | 4 +- .../plugin/transport_stdio_wait_test.go | 0 .../plugin/transport_stdio_windows_test.go | 2 +- internal/{ => ext}/pluginpkg/claude_compat.go | 10 +- .../pluginpkg/claude_instructions.go | 0 .../{ => ext}/pluginpkg/compat_legacy_test.go | 2 +- internal/{ => ext}/pluginpkg/describe.go | 0 internal/{ => ext}/pluginpkg/export.go | 0 internal/{ => ext}/pluginpkg/export_test.go | 2 +- .../{ => ext}/pluginpkg/hook_contract_test.go | 2 +- .../{ => ext}/pluginpkg/installed_compat.go | 0 internal/{ => ext}/pluginpkg/manifest_v1.go | 4 +- .../{ => ext}/pluginpkg/manifest_v1_test.go | 2 +- internal/{ => ext}/pluginpkg/manifest_v2.go | 6 +- .../{ => ext}/pluginpkg/manifest_v2_test.go | 2 +- internal/{ => ext}/pluginpkg/pluginpkg.go | 16 +- .../{ => ext}/pluginpkg/pluginpkg_test.go | 4 +- .../{ => ext}/pluginpkg/state_lock_test.go | 2 +- internal/{ => ext}/pluginspec/pluginspec.go | 8 +- .../{ => ext}/pluginspec/pluginspec_test.go | 4 +- internal/{ => ext}/skill/authority.go | 0 .../skill/authority_boundary_test.go | 2 +- internal/{ => ext}/skill/builtin_embed.go | 2 +- .../{ => ext}/skill/builtincontent/embed.go | 2 +- .../skill/builtincontent/embed_test.go | 2 +- .../builtincontent/reasonix-guide/SKILL.md | 0 internal/{ => ext}/skill/builtins.go | 4 +- internal/{ => ext}/skill/builtins_test.go | 2 +- internal/{ => ext}/skill/delivery.go | 0 .../{ => ext}/skill/delivery_frontmatter.go | 2 +- internal/{ => ext}/skill/frontmatter_keys.go | 0 internal/{ => ext}/skill/index.go | 2 +- internal/{ => ext}/skill/inspect.go | 2 +- internal/{ => ext}/skill/main_test.go | 2 +- internal/{ => ext}/skill/notfound.go | 0 internal/{ => ext}/skill/profile.go | 4 +- .../{ => ext}/skill/reasonix_guide_test.go | 4 +- internal/{ => ext}/skill/skill.go | 12 +- internal/{ => ext}/skill/skill_extra_test.go | 2 +- internal/{ => ext}/skill/skill_test.go | 6 +- internal/{ => ext}/skill/tools.go | 4 +- internal/{ => ext}/skill/tools_test.go | 6 +- internal/{ => ext}/theme/asset.go | 0 internal/{ => ext}/theme/asset_test.go | 2 +- .../theme/builtin/official-cloudsea-gilt.json | 0 .../official-crimson-horizon.background.webp | Bin .../builtin/official-crimson-horizon.json | 0 .../official-crimson-horizon.preview.webp | Bin .../official-cyan-stage.background.webp | Bin .../theme/builtin/official-cyan-stage.json | 0 .../builtin/official-cyan-stage.preview.webp | Bin .../official-fortune-forge.background.webp | Bin .../theme/builtin/official-fortune-forge.json | 0 .../official-fortune-forge.preview.webp | Bin .../official-noir-gold.background.webp | Bin .../theme/builtin/official-noir-gold.json | 0 .../builtin/official-noir-gold.preview.webp | Bin .../official-rose-dawn.background.webp | Bin .../theme/builtin/official-rose-dawn.json | 0 .../builtin/official-rose-dawn.preview.webp | Bin .../official-sage-breeze.background.webp | Bin .../theme/builtin/official-sage-breeze.json | 0 .../builtin/official-sage-breeze.preview.webp | Bin .../official-spark-notebook.background.webp | Bin .../builtin/official-spark-notebook.json | 0 .../official-spark-notebook.preview.webp | Bin .../official-violet-starlight.background.webp | Bin .../builtin/official-violet-starlight.json | 0 .../official-violet-starlight.preview.webp | Bin internal/{ => ext}/theme/plugin.go | 4 +- internal/{ => ext}/theme/plugin_test.go | 4 +- internal/{ => ext}/theme/theme.go | 2 +- internal/{ => ext}/theme/theme_test.go | 2 +- internal/{ => ext}/theme/tokens.go | 0 internal/{ => ext}/theme/tokens_test.go | 2 +- .../acp/client_integration_test.go | 12 +- internal/{ => frontend}/acp/clientio.go | 2 +- internal/{ => frontend}/acp/dispatch.go | 14 +- .../acp/dispatch_extension_test.go | 8 +- .../acp/dispatch_partial_test.go | 2 +- internal/{ => frontend}/acp/dispatch_test.go | 10 +- internal/{ => frontend}/acp/e2e_test.go | 12 +- .../{ => frontend}/acp/extension_models.go | 4 +- .../acp/extension_models_test.go | 6 +- internal/{ => frontend}/acp/inbox.go | 4 +- internal/{ => frontend}/acp/inbox_drain.go | 2 +- .../{ => frontend}/acp/inbox_drain_test.go | 6 +- internal/{ => frontend}/acp/live_test.go | 12 +- internal/{ => frontend}/acp/protocol.go | 0 internal/{ => frontend}/acp/protocol_test.go | 2 +- .../acp/reload_extensions_test.go | 6 +- .../acp/role_switch_race_test.go | 2 +- internal/{ => frontend}/acp/server.go | 0 internal/{ => frontend}/acp/server_test.go | 22 +- internal/{ => frontend}/acp/service.go | 18 +- .../{ => frontend}/acp/service_lease_test.go | 8 +- .../{ => frontend}/acp/service_lock_test.go | 4 +- internal/{ => frontend}/acp/session.go | 6 +- internal/{ => frontend}/acp/session_config.go | 4 +- .../{ => frontend}/acp/session_files_test.go | 8 +- internal/{ => frontend}/acp/session_meta.go | 8 +- .../acp/session_write_authority.go | 4 +- internal/{ => frontend}/acp/status.go | 12 +- internal/{ => frontend}/acp/status_test.go | 10 +- .../acp/switch_recovery_test.go | 10 +- .../{ => frontend}/acp/terminal_env_test.go | 0 internal/{ => frontend}/capdiag/collect.go | 16 +- .../{ => frontend}/capdiag/collect_test.go | 6 +- .../{ => frontend}/capdiag/collect_v1_test.go | 6 +- .../{ => frontend}/capdiag/hook_issues.go | 2 +- .../capdiag/hook_runtime_test.go | 2 +- internal/{ => frontend}/capdiag/live.go | 6 +- internal/{ => frontend}/capdiag/paths.go | 0 internal/{ => frontend}/capdiag/render.go | 0 .../{ => frontend}/capdiag/sanitize_test.go | 2 +- internal/{ => frontend}/capdiag/types.go | 2 +- internal/{ => frontend}/cli/account.go | 6 +- internal/{ => frontend}/cli/acp.go | 26 +- .../{ => frontend}/cli/acp_extension_test.go | 12 +- internal/{ => frontend}/cli/acp_test.go | 16 +- .../{ => frontend}/cli/ansi_console_other.go | 0 .../cli/ansi_console_windows.go | 0 internal/{ => frontend}/cli/bench_flags.go | 2 +- internal/{ => frontend}/cli/box.go | 0 internal/{ => frontend}/cli/box_test.go | 0 internal/{ => frontend}/cli/branch.go | 0 internal/{ => frontend}/cli/branch_test.go | 0 internal/{ => frontend}/cli/build_options.go | 16 +- internal/{ => frontend}/cli/buildinfo.go | 0 internal/{ => frontend}/cli/buildinfo_test.go | 0 internal/{ => frontend}/cli/catalogs.go | 4 +- .../{ => frontend}/cli/catalogs_history.go | 4 +- internal/{ => frontend}/cli/catalogs_usage.go | 4 +- internal/{ => frontend}/cli/cli.go | 24 +- internal/{ => frontend}/cli/cli_flags.go | 2 +- internal/{ => frontend}/cli/cli_flags_test.go | 6 +- internal/{ => frontend}/cli/cli_test.go | 20 +- internal/{ => frontend}/cli/complete.go | 0 .../cli/context_window_prompt_test.go | 0 internal/{ => frontend}/cli/currency.go | 0 internal/{ => frontend}/cli/default_model.go | 4 +- .../cli/delegation_metrics_test.go | 2 +- internal/{ => frontend}/cli/diffview.go | 4 +- internal/{ => frontend}/cli/diffview_test.go | 2 +- internal/{ => frontend}/cli/docs_manifest.go | 2 +- internal/{ => frontend}/cli/doctor.go | 6 +- .../{ => frontend}/cli/doctor_capabilities.go | 2 +- .../cli/doctor_capabilities_test.go | 4 +- .../{ => frontend}/cli/doctor_repair_test.go | 2 +- internal/{ => frontend}/cli/doctor_runtime.go | 2 +- internal/{ => frontend}/cli/doctor_test.go | 4 +- .../{ => frontend}/cli/extension_surface.go | 8 +- .../cli/extension_surface_test.go | 6 +- internal/{ => frontend}/cli/flag_parse.go | 2 +- .../{ => frontend}/cli/flag_parse_test.go | 0 internal/{ => frontend}/cli/gitstatus.go | 2 +- internal/{ => frontend}/cli/gitstatus_test.go | 2 +- internal/{ => frontend}/cli/help_view.go | 8 +- internal/{ => frontend}/cli/hide_other.go | 0 internal/{ => frontend}/cli/hide_windows.go | 0 internal/{ => frontend}/cli/hook_machine.go | 2 +- .../{ => frontend}/cli/hook_machine_test.go | 4 +- internal/{ => frontend}/cli/hooks_view.go | 2 +- internal/{ => frontend}/cli/latex.go | 0 internal/{ => frontend}/cli/latex_test.go | 0 .../cli/machine_identity_test.go | 2 +- internal/{ => frontend}/cli/main_test.go | 4 +- internal/{ => frontend}/cli/mathnode.go | 0 internal/{ => frontend}/cli/mcp.go | 8 +- internal/{ => frontend}/cli/mcp_manager.go | 0 .../{ => frontend}/cli/mcp_manager_actions.go | 0 internal/{ => frontend}/cli/mcp_oauth.go | 10 +- internal/{ => frontend}/cli/mcp_oauth_test.go | 6 +- .../{ => frontend}/cli/mcp_remove_helpers.go | 6 +- .../{ => frontend}/cli/mcp_remove_test.go | 6 +- internal/{ => frontend}/cli/mcp_view.go | 4 +- internal/{ => frontend}/cli/md.go | 0 internal/{ => frontend}/cli/md_cjk_test.go | 0 internal/{ => frontend}/cli/md_test.go | 0 internal/{ => frontend}/cli/memory_view.go | 4 +- internal/{ => frontend}/cli/model.go | 2 +- internal/{ => frontend}/cli/model_view.go | 2 +- internal/{ => frontend}/cli/notifications.go | 8 +- .../{ => frontend}/cli/output_style_view.go | 2 +- internal/{ => frontend}/cli/plugin.go | 8 +- .../{ => frontend}/cli/plugin_slash_test.go | 0 internal/{ => frontend}/cli/plugin_test.go | 4 +- internal/{ => frontend}/cli/plugin_v1_test.go | 4 +- .../cli/provider_context_window.go | 2 +- .../{ => frontend}/cli/provider_wizard.go | 4 +- internal/{ => frontend}/cli/quick_picker.go | 0 .../{ => frontend}/cli/reasoning_language.go | 0 internal/{ => frontend}/cli/recovery_gc.go | 2 +- .../cli/recovery_machine_test.go | 6 +- internal/{ => frontend}/cli/remote.go | 8 +- internal/{ => frontend}/cli/remote_broker.go | 12 +- .../{ => frontend}/cli/remote_cmd_test.go | 4 +- internal/{ => frontend}/cli/remote_connect.go | 16 +- .../{ => frontend}/cli/remote_serve_url.go | 0 .../cli/remote_serve_url_test.go | 8 +- internal/{ => frontend}/cli/rename_test.go | 4 +- .../{ => frontend}/cli/render_edge_test.go | 2 +- internal/{ => frontend}/cli/report.go | 6 +- internal/{ => frontend}/cli/report_test.go | 8 +- internal/{ => frontend}/cli/resume.go | 4 +- internal/{ => frontend}/cli/resume_picker.go | 2 +- .../cli/retry_indicator_test.go | 2 +- internal/{ => frontend}/cli/review.go | 16 +- internal/{ => frontend}/cli/review_test.go | 8 +- internal/{ => frontend}/cli/run_completion.go | 4 +- .../{ => frontend}/cli/run_completion_test.go | 2 +- .../cli/run_failure_report_test.go | 0 .../{ => frontend}/cli/run_graph_metrics.go | 2 +- .../cli/run_graph_metrics_test.go | 4 +- internal/{ => frontend}/cli/run_metrics.go | 10 +- .../{ => frontend}/cli/run_metrics_cost.go | 2 +- .../cli/run_metrics_cost_test.go | 2 +- .../cli/run_metrics_partial_test.go | 6 +- .../{ => frontend}/cli/run_metrics_test.go | 8 +- internal/{ => frontend}/cli/run_output.go | 6 +- .../{ => frontend}/cli/run_output_test.go | 4 +- internal/{ => frontend}/cli/run_sink.go | 12 +- internal/{ => frontend}/cli/scroll_state.go | 0 internal/{ => frontend}/cli/select.go | 2 +- internal/{ => frontend}/cli/select_test.go | 0 internal/{ => frontend}/cli/serve_broker.go | 4 +- .../{ => frontend}/cli/serve_broker_test.go | 4 +- internal/{ => frontend}/cli/serve_files.go | 6 +- .../{ => frontend}/cli/serve_files_test.go | 2 +- internal/{ => frontend}/cli/serve_frontend.go | 16 +- .../cli/serve_provider_setup_test.go | 2 +- internal/{ => frontend}/cli/session_lease.go | 6 +- .../{ => frontend}/cli/session_machine.go | 12 +- .../cli/session_machine_test.go | 8 +- internal/{ => frontend}/cli/setup_manager.go | 4 +- .../{ => frontend}/cli/setup_manager_test.go | 4 +- .../{ => frontend}/cli/shell_completion.go | 2 +- .../cli/shell_completion_test.go | 0 internal/{ => frontend}/cli/skill_picker.go | 0 .../{ => frontend}/cli/skill_picker_view.go | 0 internal/{ => frontend}/cli/skill_view.go | 2 +- internal/{ => frontend}/cli/slash_registry.go | 2 +- .../{ => frontend}/cli/slash_registry_test.go | 0 internal/{ => frontend}/cli/style.go | 0 .../{ => frontend}/cli/style_profile_test.go | 0 internal/{ => frontend}/cli/subagent.go | 12 +- .../cli/subagent_handoff_metrics_test.go | 2 +- internal/{ => frontend}/cli/subagent_test.go | 12 +- internal/{ => frontend}/cli/task.go | 2 +- internal/{ => frontend}/cli/task_machine.go | 4 +- .../{ => frontend}/cli/task_machine_test.go | 10 +- internal/{ => frontend}/cli/task_test.go | 4 +- internal/{ => frontend}/cli/theme.go | 0 .../{ => frontend}/cli/theme_osc_other.go | 0 internal/{ => frontend}/cli/theme_osc_unix.go | 0 internal/{ => frontend}/cli/theme_sweep.go | 0 .../{ => frontend}/cli/theme_sweep_test.go | 0 internal/{ => frontend}/cli/theme_test.go | 0 internal/{ => frontend}/cli/toolcard.go | 2 +- internal/{ => frontend}/cli/toolcard_test.go | 0 internal/{ => frontend}/cli/transcript.go | 0 .../{ => frontend}/cli/transcript_test.go | 0 .../{ => frontend}/cli/tui_diagnostics.go | 0 internal/{ => frontend}/cli/turn_failure.go | 0 .../{ => frontend}/cli/turn_failure_test.go | 0 internal/{ => frontend}/cli/upgrade.go | 8 +- internal/{ => frontend}/cli/upgrade_test.go | 8 +- .../{ => frontend}/cli/upgrade_token_test.go | 0 .../cli/usage_catalog_lifecycle.go | 6 +- internal/{ => frontend}/cli/view_helpers.go | 0 .../{ => frontend}/cli/view_helpers_test.go | 14 +- internal/{ => frontend}/cli/web_browser.go | 0 .../{ => frontend}/cli/web_process_unix.go | 0 .../{ => frontend}/cli/web_process_windows.go | 0 internal/{ => frontend}/cli/web_runtime.go | 6 +- .../{ => frontend}/cli/web_runtime_test.go | 4 +- internal/{ => frontend}/cli/web_test.go | 8 +- internal/{ => frontend}/cli/width_test.go | 0 internal/{ => frontend}/doctor/billing.go | 4 +- .../{ => frontend}/doctor/billing_test.go | 2 +- internal/{ => frontend}/doctor/git_test.go | 2 +- internal/{ => frontend}/doctor/main_test.go | 2 +- internal/{ => frontend}/doctor/quality.go | 10 +- .../{ => frontend}/doctor/quality_test.go | 4 +- .../doctor/reasoning_report_test.go | 2 +- internal/{ => frontend}/doctor/report.go | 16 +- internal/{ => frontend}/doctor/report_test.go | 4 +- .../{ => frontend}/doctor/session_bundle.go | 6 +- .../doctor/session_bundle_test.go | 6 +- .../{ => frontend}/doctor/session_redact.go | 10 +- .../doctor/session_redact_test.go | 8 +- .../{ => frontend}/doctor/skill_health.go | 6 +- .../doctor/skill_health_test.go | 4 +- .../{ => frontend}/remotehost/remotehost.go | 18 +- internal/{ => frontend}/serve/account.go | 6 +- internal/{ => frontend}/serve/account_test.go | 4 +- .../{ => frontend}/serve/adjudications.go | 2 +- .../serve/adjudications_test.go | 6 +- internal/{ => frontend}/serve/appearance.go | 2 +- .../serve/approval_persist_test.go | 6 +- internal/{ => frontend}/serve/ask.go | 0 internal/{ => frontend}/serve/ask_test.go | 2 +- internal/{ => frontend}/serve/attachments.go | 2 +- .../{ => frontend}/serve/attachments_test.go | 6 +- internal/{ => frontend}/serve/auth.go | 2 +- .../serve/auth_fragment_test.go | 2 +- internal/{ => frontend}/serve/auth_test.go | 2 +- internal/{ => frontend}/serve/balance.go | 4 +- .../serve/balance_route_test.go | 8 +- internal/{ => frontend}/serve/boundary.go | 2 +- .../{ => frontend}/serve/boundary_test.go | 6 +- internal/{ => frontend}/serve/broadcaster.go | 6 +- .../{ => frontend}/serve/broadcaster_test.go | 4 +- internal/{ => frontend}/serve/browser_host.go | 2 +- .../{ => frontend}/serve/browser_host_test.go | 2 +- internal/{ => frontend}/serve/browser_open.go | 0 internal/{ => frontend}/serve/browser_tabs.go | 0 .../{ => frontend}/serve/browser_tabs_test.go | 4 +- .../serve/capability_project.go | 6 +- .../serve/capability_project_test.go | 2 +- .../{ => frontend}/serve/capability_scope.go | 2 +- internal/{ => frontend}/serve/catalog.go | 12 +- .../serve/catalog_refusal_test.go | 10 +- internal/{ => frontend}/serve/catalog_test.go | 12 +- internal/{ => frontend}/serve/changes.go | 2 +- internal/{ => frontend}/serve/changes_test.go | 6 +- internal/{ => frontend}/serve/compact.go | 2 +- .../serve/compaction_settings.go | 0 internal/{ => frontend}/serve/complete.go | 4 +- .../{ => frontend}/serve/complete_test.go | 8 +- internal/{ => frontend}/serve/config_file.go | 0 .../{ => frontend}/serve/config_file_test.go | 4 +- .../{ => frontend}/serve/context_window.go | 2 +- .../serve/context_window_test.go | 4 +- internal/{ => frontend}/serve/csrf_test.go | 4 +- .../serve/decisions_status_test.go | 14 +- internal/{ => frontend}/serve/drop.go | 2 +- internal/{ => frontend}/serve/drop_test.go | 6 +- internal/{ => frontend}/serve/editor.go | 4 +- internal/{ => frontend}/serve/editor_test.go | 4 +- .../serve/effort_refusal_test.go | 6 +- internal/{ => frontend}/serve/effort_test.go | 2 +- internal/{ => frontend}/serve/eventstream.go | 2 +- .../{ => frontend}/serve/eventstream_test.go | 2 +- .../{ => frontend}/serve/executiongraph.go | 2 +- .../serve/executiongraph_test.go | 6 +- internal/{ => frontend}/serve/extensions.go | 0 .../{ => frontend}/serve/extensions_test.go | 4 +- internal/{ => frontend}/serve/fail.go | 2 +- .../serve/frontend_contract_test.go | 2 +- internal/{ => frontend}/serve/history.go | 4 +- .../serve/history_failure_test.go | 4 +- internal/{ => frontend}/serve/hooks.go | 2 +- .../serve/host_authored_history_test.go | 12 +- internal/{ => frontend}/serve/hub.go | 22 +- .../{ => frontend}/serve/hub_approval_test.go | 6 +- .../{ => frontend}/serve/hub_balance_test.go | 4 +- .../serve/hub_decision_audit_test.go | 14 +- .../serve/hub_interactive_test.go | 16 +- .../{ => frontend}/serve/hub_lease_test.go | 8 +- .../serve/hub_open_refusal_test.go | 6 +- internal/{ => frontend}/serve/hub_picker.go | 0 .../{ => frontend}/serve/hub_picker_other.go | 0 .../{ => frontend}/serve/hub_picker_test.go | 0 .../serve/hub_picker_windows.go | 0 internal/{ => frontend}/serve/hub_release.go | 0 internal/{ => frontend}/serve/hub_remote.go | 2 +- .../{ => frontend}/serve/hub_remote_test.go | 4 +- .../{ => frontend}/serve/hub_resolver_test.go | 6 +- internal/{ => frontend}/serve/hub_serve.go | 0 internal/{ => frontend}/serve/hub_test.go | 12 +- internal/{ => frontend}/serve/hub_tree.go | 14 +- .../serve/hub_tree_remove_test.go | 8 +- internal/{ => frontend}/serve/inbox.go | 4 +- .../serve/inbox_refusal_test.go | 4 +- internal/{ => frontend}/serve/inbox_test.go | 4 +- internal/{ => frontend}/serve/listen.go | 0 internal/{ => frontend}/serve/login.html | 0 .../{ => frontend}/serve/logo-wordmark.svg | 0 internal/{ => frontend}/serve/loopback.go | 0 .../{ => frontend}/serve/loopback_test.go | 6 +- internal/{ => frontend}/serve/main_test.go | 2 +- internal/{ => frontend}/serve/memory.go | 2 +- .../{ => frontend}/serve/model_refs_test.go | 8 +- internal/{ => frontend}/serve/modelcaps.go | 2 +- .../{ => frontend}/serve/modelcaps_test.go | 6 +- .../{ => frontend}/serve/modelroutes_test.go | 0 .../{ => frontend}/serve/models_catalog.go | 4 +- .../{ => frontend}/serve/modelswitch_test.go | 2 +- internal/{ => frontend}/serve/network.go | 2 +- .../{ => frontend}/serve/notifications.go | 2 +- internal/{ => frontend}/serve/page.go | 0 internal/{ => frontend}/serve/page_test.go | 2 +- internal/{ => frontend}/serve/pane_sink.go | 4 +- internal/{ => frontend}/serve/plan.go | 2 +- internal/{ => frontend}/serve/plugins.go | 8 +- internal/{ => frontend}/serve/plugins_test.go | 8 +- .../{ => frontend}/serve/prompt_refine.go | 2 +- .../serve/prompt_refine_test.go | 10 +- .../{ => frontend}/serve/provider_check.go | 8 +- .../serve/provider_check_test.go | 4 +- .../serve/provider_continuation_test.go | 6 +- .../{ => frontend}/serve/provider_edit.go | 2 +- .../serve/provider_edit_test.go | 6 +- .../{ => frontend}/serve/provider_keyreuse.go | 2 +- .../serve/provider_keyreuse_test.go | 2 +- .../{ => frontend}/serve/provider_setup.go | 2 +- .../serve/provider_setup_test.go | 6 +- .../serve/provider_thinking_test.go | 2 +- internal/{ => frontend}/serve/providers.go | 4 +- .../{ => frontend}/serve/providers_test.go | 10 +- .../{ => frontend}/serve/rebuild_sink_test.go | 10 +- .../serve/rebuild_workspace_test.go | 6 +- .../serve/recovery_fold_test.go | 6 +- .../serve/refusal_parity_test.go | 4 +- .../{ => frontend}/serve/refuse_common.go | 0 .../serve/reload_options_test.go | 8 +- internal/{ => frontend}/serve/remote_book.go | 2 +- .../{ => frontend}/serve/remote_book_test.go | 4 +- .../{ => frontend}/serve/remote_browse.go | 0 .../serve/remote_browse_test.go | 0 internal/{ => frontend}/serve/resume.go | 6 +- internal/{ => frontend}/serve/rewind.go | 4 +- internal/{ => frontend}/serve/roles.go | 2 +- internal/{ => frontend}/serve/roles_test.go | 2 +- .../{ => frontend}/serve/route_parity_test.go | 2 +- internal/{ => frontend}/serve/routes.go | 0 internal/{ => frontend}/serve/serve.go | 22 +- .../{ => frontend}/serve/serve_lease_test.go | 10 +- .../{ => frontend}/serve/serve_lock_test.go | 6 +- .../serve/serve_portfile_test.go | 6 +- internal/{ => frontend}/serve/serve_test.go | 20 +- .../serve/session_files_partial_test.go | 8 +- .../serve/session_files_test.go | 8 +- .../serve/session_write_authority.go | 4 +- .../serve/sessions_current_test.go | 6 +- .../{ => frontend}/serve/sessions_recovery.go | 2 +- .../serve/sessions_recovery_test.go | 10 +- .../serve/sessions_sidecar_test.go | 10 +- .../serve/sessions_visibility_test.go | 10 +- internal/{ => frontend}/serve/settings.go | 10 +- internal/{ => frontend}/serve/shell.go | 0 internal/{ => frontend}/serve/shell_test.go | 4 +- internal/{ => frontend}/serve/storage.go | 4 +- internal/{ => frontend}/serve/storage_test.go | 4 +- .../{ => frontend}/serve/studio_version.go | 2 +- .../serve/studio_version_test.go | 6 +- .../serve/submit_authority_test.go | 8 +- internal/{ => frontend}/serve/surfaces.go | 2 +- .../{ => frontend}/serve/surfaces_test.go | 4 +- .../{ => frontend}/serve/switch_axes_test.go | 2 +- .../serve/switch_recovery_test.go | 14 +- internal/{ => frontend}/serve/themes.go | 4 +- internal/{ => frontend}/serve/themes_test.go | 6 +- internal/{ => frontend}/serve/title_test.go | 6 +- internal/{ => frontend}/serve/titlecache.go | 2 +- .../{ => frontend}/serve/titlecache_test.go | 2 +- internal/{ => frontend}/serve/titlefill.go | 6 +- internal/{ => frontend}/serve/todos.go | 0 .../{ => frontend}/serve/trace_facts_test.go | 2 +- .../serve/trace_fixture_test.go | 10 +- .../{ => frontend}/serve/trace_parity_test.go | 14 +- internal/{ => frontend}/serve/tray.go | 6 +- internal/{ => frontend}/serve/tray_test.go | 6 +- .../serve/turn_identity_test.go | 12 +- internal/{ => frontend}/serve/update.go | 4 +- internal/{ => frontend}/serve/update_test.go | 6 +- internal/{ => frontend}/serve/usage.go | 4 +- .../{ => frontend}/serve/web_entry_test.go | 4 +- internal/{ => frontend}/serve/welcome.go | 2 +- internal/{ => frontend}/serve/welcome_test.go | 2 +- internal/{ => frontend}/serve/wirelog.go | 6 +- .../serve/wirelog_coverage_test.go | 2 +- internal/{ => frontend}/serve/wirelog_test.go | 6 +- .../serve/workgroup_semantics_test.go | 10 +- internal/{ => frontend}/serve/workspace.go | 12 +- .../{ => frontend}/serve/workspace_files.go | 0 .../serve/workspace_files_test.go | 6 +- .../{ => frontend}/serve/workspace_test.go | 6 +- .../{ => frontend}/traystate/traystate.go | 2 +- .../traystate/traystate_test.go | 2 +- .../anthropic/anthropic.go | 6 +- .../anthropic/anthropic_test.go | 2 +- .../anthropic/image_test.go | 2 +- .../anthropic/output_budget.go | 0 .../anthropic/output_budget_test.go | 0 .../anthropic/realdeepseek_test.go | 2 +- .../anthropic/realyyds_test.go | 2 +- .../anthropic/reasoning.go | 4 +- .../anthropic/reasoning_replay_test.go | 2 +- .../anthropic/request_url_test.go | 2 +- .../anthropic/stall_test.go | 2 +- .../anthropic/stream_error.go | 2 +- .../anthropic/tool_execution_wire_test.go | 2 +- .../anthropic/web_search.go | 2 +- .../anthropic/web_search_test.go | 2 +- internal/{ => model}/billing/balance.go | 0 .../{ => model}/billing/balance_extra_test.go | 0 internal/{ => model}/billing/balance_test.go | 0 internal/{ => model}/billing/cache.go | 0 internal/{ => model}/billing/cache_test.go | 0 internal/{ => model}/billing/catalog.go | 0 internal/{ => model}/billing/catalog_test.go | 0 internal/{ => model}/billing/coverage.go | 0 internal/{ => model}/billing/coverage_test.go | 0 internal/{ => model}/billing/ledger.go | 0 internal/{ => model}/billing/migrate.go | 0 internal/{ => model}/billing/migrate_test.go | 0 internal/{ => model}/billing/money.go | 0 internal/{ => model}/billing/money_test.go | 0 internal/{ => model}/billing/quote.go | 0 internal/{ => model}/billing/quote_test.go | 0 internal/{ => model}/billing/rates.go | 0 internal/{ => model}/billing/rates_test.go | 0 internal/{ => model}/billing/shape.go | 0 internal/{ => model}/billing/shape_test.go | 0 internal/{ => model}/billing/window.go | 0 internal/{ => model}/billing/window_test.go | 0 internal/{ => model}/boundedllm/bounded.go | 6 +- internal/{ => model}/laya/client.go | 2 +- .../{provider => model}/openai/downgrade.go | 2 +- internal/{provider => model}/openai/effort.go | 2 +- .../openai/effort_declared_test.go | 2 +- .../openai/effort_override_test.go | 2 +- .../{provider => model}/openai/effort_test.go | 2 +- .../openai/empty_stream_test.go | 2 +- .../openai/fetch_models.go | 0 .../openai/fetch_models_test.go | 0 .../openai/h2_reset_test.go | 2 +- internal/{provider => model}/openai/host.go | 2 +- .../{provider => model}/openai/host_test.go | 0 .../{provider => model}/openai/image_test.go | 2 +- .../openai/keyrotation_test.go | 2 +- .../{provider => model}/openai/kimi_k3.go | 0 .../openai/kimi_k3_test.go | 2 +- .../{provider => model}/openai/lifecycle.go | 0 internal/{provider => model}/openai/openai.go | 4 +- .../{provider => model}/openai/openai_test.go | 2 +- .../openai/output_budget.go | 0 .../openai/output_budget_test.go | 0 .../openai/realcache_test.go | 4 +- .../openai/reasoning_replay.go | 2 +- .../openai/reasoning_replay_test.go | 2 +- .../openai/reconnect_test.go | 2 +- .../openai/request_url_test.go | 2 +- .../openai/stall_recover_test.go | 2 +- .../{provider => model}/openai/stall_test.go | 2 +- .../openai/stream_error.go | 0 .../openai/stream_failure.go | 4 +- .../openai/stream_payload_error_test.go | 2 +- internal/{provider => model}/openai/think.go | 0 .../{provider => model}/openai/think_test.go | 0 .../openai/tool_execution_wire_test.go | 2 +- .../{ => model}/providerbroker/broker_test.go | 2 +- internal/{ => model}/providerbroker/client.go | 2 +- internal/{ => model}/providerbroker/doc.go | 0 internal/{ => model}/providerbroker/local.go | 2 +- internal/{ => model}/providerbroker/server.go | 2 +- .../{ => model}/providerbroker/tunnel_test.go | 6 +- internal/{ => model}/providerbroker/wire.go | 2 +- .../responses/image_test.go | 2 +- .../responses/keyresolver.go | 0 .../responses/output_budget.go | 2 +- .../responses/output_budget_test.go | 0 .../responses/realdeepseek_test.go | 2 +- .../responses/request_url_test.go | 2 +- .../responses/responses.go | 6 +- .../responses/responses_test.go | 2 +- .../responses/stall_test.go | 2 +- .../{provider => model}/responses/stream.go | 2 +- .../responses/test_hooks.go | 0 .../responses/tool_execution_wire_test.go | 2 +- .../{provider => model}/responses/vendor.go | 2 +- .../responses/web_search.go | 2 +- .../responses/web_search_replay_test.go | 2 +- .../responses/wire_gap_test.go | 2 +- .../{ => model}/visionimage/visionimage.go | 0 .../visionimage/visionimage_test.go | 0 internal/{ => platform}/account/account.go | 0 .../{ => platform}/account/account_test.go | 0 internal/{ => platform}/account/token.go | 2 +- .../{ => platform}/appidentity/identity.go | 0 .../appidentity/identity_test.go | 0 .../{ => platform}/appupdate/apply_other.go | 2 +- .../{ => platform}/appupdate/apply_windows.go | 2 +- .../{ => platform}/appupdate/appupdate.go | 4 +- .../appupdate/appupdate_test.go | 2 +- .../{ => platform}/appupdate/catalog_test.go | 0 internal/{ => platform}/appupdate/install.go | 4 +- internal/{ => platform}/browser/act.go | 0 .../{ => platform}/browser/browser_test.go | 2 +- internal/{ => platform}/browser/capture.go | 2 +- internal/{ => platform}/browser/cdp.go | 0 internal/{ => platform}/browser/credential.go | 0 internal/{ => platform}/browser/discover.go | 0 internal/{ => platform}/browser/doc.go | 0 internal/{ => platform}/browser/endpoint.go | 0 .../{ => platform}/browser/endpoint_test.go | 0 internal/{ => platform}/browser/engine.go | 2 +- internal/{ => platform}/browser/eval.go | 0 internal/{ => platform}/browser/eval_test.go | 0 internal/{ => platform}/browser/failure.go | 0 .../{ => platform}/browser/fake_cdp_test.go | 0 internal/{ => platform}/browser/keys.go | 0 internal/{ => platform}/browser/live_test.go | 2 +- internal/{ => platform}/browser/network.go | 0 internal/{ => platform}/browser/policy.go | 2 +- internal/{ => platform}/browser/refs.go | 0 internal/{ => platform}/browser/session.go | 0 internal/{ => platform}/browser/snapshot.go | 0 internal/{ => platform}/browser/tab.go | 0 internal/{ => platform}/browser/transport.go | 0 internal/{ => platform}/computer/doc.go | 0 internal/{ => platform}/computer/failure.go | 0 internal/{ => platform}/computer/helper.go | 2 +- .../computer/live_darwin_test.go | 2 +- internal/{ => platform}/computer/live_test.go | 0 .../computer/live_windows_test.go | 2 +- internal/{ => platform}/computer/session.go | 2 +- .../{ => platform}/computer/session_test.go | 2 +- .../computer/testdata/target.swift | 0 .../computer/testdata/wintarget/main.go | 0 internal/{ => platform}/crashreport/cli.go | 4 +- .../{ => platform}/crashreport/cli_test.go | 10 +- internal/{ => platform}/editor/editor.go | 0 internal/{ => platform}/editor/editor_test.go | 0 internal/{ => platform}/environment/probe.go | 8 +- .../environment/probe_share_test.go | 2 +- .../{ => platform}/environment/probe_test.go | 4 +- .../environment/probe_windows_test.go | 0 .../{ => platform}/environment/snapshot.go | 4 +- .../environment/snapshot_test.go | 2 +- .../environment/workspace_vcs.go | 2 +- .../environment/workspace_vcs_test.go | 4 +- internal/{ => platform}/gitcmd/gitcmd.go | 4 +- internal/{ => platform}/gitcmd/gitcmd_test.go | 2 +- .../{ => platform}/gitstatus/gitstatus.go | 2 +- .../gitstatus/gitstatus_test.go | 2 +- .../{ => platform}/gitstatus/numstat_test.go | 0 .../{ => platform}/installlayout/activate.go | 2 +- .../installlayout/activate_test.go | 2 +- .../{ => platform}/installlayout/current.go | 2 +- .../installlayout/current_test.go | 2 +- .../installlayout/fault_inject_test.go | 2 +- .../{ => platform}/instanceid/instanceid.go | 4 +- .../instanceid/instanceid_test.go | 0 internal/{ => platform}/lsp/client.go | 4 +- internal/{ => platform}/lsp/jsonrpc.go | 0 .../lsp/jsonrpc_framecap_test.go | 0 internal/{ => platform}/lsp/lsp_test.go | 2 +- internal/{ => platform}/lsp/main_test.go | 0 internal/{ => platform}/lsp/manager.go | 0 internal/{ => platform}/lsp/manual_test.go | 4 +- internal/{ => platform}/lsp/position.go | 0 internal/{ => platform}/lsp/results.go | 0 .../lsp/testdata/lsp/bash/script.sh | 0 .../lsp/testdata/lsp/golang/go.mod | 0 .../lsp/testdata/lsp/golang/main.go | 0 .../lsp/testdata/lsp/python/main.py | 0 .../lsp/testdata/lsp/rust/.gitignore | 0 .../lsp/testdata/lsp/rust/Cargo.lock | 0 .../lsp/testdata/lsp/rust/Cargo.toml | 0 .../lsp/testdata/lsp/rust/src/main.rs | 0 .../lsp/testdata/lsp/typescript/index.ts | 0 .../lsp/testdata/lsp/typescript/tsconfig.json | 0 internal/{ => platform}/lsp/tool.go | 2 +- .../{ => platform}/notify/sender_darwin.go | 2 +- .../{ => platform}/notify/sender_linux.go | 2 +- .../{ => platform}/notify/sender_other.go | 0 .../{ => platform}/notify/sender_windows.go | 2 +- internal/{ => platform}/notify/settings.go | 2 +- internal/{ => platform}/notify/sink.go | 6 +- internal/{ => platform}/notify/sink_test.go | 6 +- internal/{ => platform}/packagegrant/acl.go | 0 .../{ => platform}/packagegrant/acl_test.go | 0 internal/{ => platform}/packagegrant/doc.go | 0 .../packagegrant/strip_other.go | 0 .../packagegrant/strip_windows.go | 0 .../packagegrant/strip_windows_test.go | 0 internal/{ => platform}/releaseasset/cache.go | 0 .../{ => platform}/releaseasset/cache_test.go | 0 internal/{ => platform}/releaseasset/cli.go | 2 +- .../{ => platform}/releaseasset/cli_test.go | 0 internal/{ => platform}/remote/agent.go | 0 internal/{ => platform}/remote/agent_test.go | 4 +- internal/{ => platform}/remote/agent_unix.go | 0 .../{ => platform}/remote/agent_windows.go | 0 .../{ => platform}/remote/attach/attach.go | 10 +- .../remote/attach/attach_test.go | 8 +- .../{ => platform}/remote/attach/browse.go | 2 +- .../remote/attach/browse_test.go | 6 +- internal/{ => platform}/remote/attach/dial.go | 6 +- .../{ => platform}/remote/attach/probe.go | 2 +- internal/{ => platform}/remote/auth.go | 0 .../{ => platform}/remote/backoff_test.go | 0 .../remote/bootstrap/bootstrap.go | 6 +- .../remote/bootstrap/bootstrap_pure_test.go | 4 +- .../remote/bootstrap/ensure_test.go | 8 +- .../{ => platform}/remote/bootstrap/errors.go | 0 .../{ => platform}/remote/bootstrap/fetch.go | 2 +- .../remote/bootstrap/fetch_live_test.go | 4 +- .../remote/bootstrap/fetch_test.go | 4 +- .../remote/bootstrap/hardening_test.go | 4 +- .../remote/bootstrap/install.go | 4 +- .../{ => platform}/remote/bootstrap/launch.go | 0 .../{ => platform}/remote/bootstrap/lock.go | 2 +- .../remote/bootstrap/platform.go | 0 .../remote/bootstrap/posixshell.go | 4 +- .../{ => platform}/remote/bootstrap/probe.go | 2 +- .../remote/bootstrap/probe_test.go | 4 +- .../remote/bootstrap/remoteos.go | 4 +- .../{ => platform}/remote/bootstrap/state.go | 2 +- .../remote/bootstrap/state_test.go | 0 .../remote/bootstrap/windowsshell.go | 4 +- .../remote/bootstrap/windowsshell_test.go | 0 internal/{ => platform}/remote/client.go | 6 +- .../remote/client_agent_unix_test.go | 4 +- internal/{ => platform}/remote/client_test.go | 4 +- internal/{ => platform}/remote/dial.go | 2 +- .../remote/dial_hardening_test.go | 2 +- internal/{ => platform}/remote/dial_test.go | 0 .../remote/forward/addrinuse.go | 0 .../remote/forward/addrinuse_windows.go | 0 .../{ => platform}/remote/forward/forward.go | 0 .../remote/forward/forward_test.go | 0 internal/{ => platform}/remote/forward/set.go | 0 .../{ => platform}/remote/forward/set_test.go | 2 +- internal/{ => platform}/remote/host.go | 2 +- internal/{ => platform}/remote/host_test.go | 2 +- .../remote/jump_resolve_test.go | 4 +- internal/{ => platform}/remote/knownhosts.go | 0 .../remote/knownhosts_error_test.go | 0 .../{ => platform}/remote/knownhosts_test.go | 4 +- internal/{ => platform}/remote/paths.go | 2 +- .../{ => platform}/remote/reconnect_test.go | 2 +- internal/{ => platform}/remote/remote.go | 2 +- .../{ => platform}/remote/sftpfs/detect.go | 0 .../remote/sftpfs/detect_test.go | 0 .../{ => platform}/remote/sftpfs/sftpfs.go | 0 .../remote/sftpfs/sftpfs_test.go | 4 +- internal/{ => platform}/remote/sshconfig.go | 0 .../{ => platform}/remote/sshconfig_test.go | 4 +- .../{ => platform}/remote/sshtest/keys.go | 0 .../{ => platform}/remote/sshtest/sshtest.go | 0 internal/{ => platform}/remote/status.go | 0 .../{ => platform}/repair/apply_failure.go | 4 +- internal/{ => platform}/repair/config.go | 4 +- internal/{ => platform}/repair/config_test.go | 4 +- internal/{ => platform}/repair/derived.go | 2 +- internal/{ => platform}/repair/diagnose.go | 4 +- .../{ => platform}/repair/diagnose_test.go | 2 +- internal/{ => platform}/repair/main_test.go | 2 +- .../{ => platform}/repair/mutation_lock.go | 4 +- .../repair/open_regular_other.go | 0 .../repair/open_regular_unix.go | 0 .../repair/open_regular_windows.go | 0 .../{ => platform}/repair/path_case_darwin.go | 0 .../repair/path_case_darwin_test.go | 2 +- .../{ => platform}/repair/path_case_other.go | 0 .../repair/path_case_platform.go | 0 .../repair/path_case_windows.go | 0 .../repair/path_unicode_other.go | 0 internal/{ => platform}/repair/plan.go | 4 +- internal/{ => platform}/repair/plan_test.go | 4 +- .../{ => platform}/repair/process_other.go | 0 .../{ => platform}/repair/process_unix.go | 0 .../{ => platform}/repair/process_windows.go | 0 .../{ => platform}/repair/provenance_test.go | 2 +- .../repair/rename_noreplace_darwin.go | 0 .../repair/rename_noreplace_linux.go | 0 .../repair/rename_noreplace_other.go | 0 .../repair/rename_noreplace_windows.go | 0 .../repair/rename_noreplace_windows_test.go | 2 +- internal/{ => platform}/repair/snapshot.go | 4 +- internal/{ => platform}/repair/startup.go | 4 +- .../{ => platform}/repair/startup_test.go | 2 +- .../repair/startup_windows_test.go | 2 +- internal/{ => platform}/repair/transaction.go | 4 +- .../{ => platform}/repair/transaction_test.go | 4 +- internal/{ => platform}/repair/update.go | 6 +- .../repair/update_debris_test.go | 2 +- .../repair/update_file_claim_test.go | 2 +- .../repair/update_handoff_commit_test.go | 0 .../update_handoff_darwin_smoke_test.go | 4 +- .../repair/update_handoff_test.go | 2 +- .../{ => platform}/repair/update_health.go | 0 .../{ => platform}/repair/update_legacy.go | 4 +- .../repair/update_legacy_test.go | 4 +- .../{ => platform}/repair/update_lock_test.go | 2 +- .../repair/update_security_test.go | 2 +- internal/{ => platform}/repair/update_test.go | 2 +- .../repair/update_test_helpers_test.go | 0 internal/{ => platform}/telemetry/client.go | 6 +- .../{ => platform}/telemetry/client_test.go | 10 +- .../{ => platform}/telemetry/lease_test.go | 2 +- internal/{ => platform}/telemetry/payload.go | 0 internal/{ => platform}/telemetry/pending.go | 0 internal/{ => platform}/telemetry/policy.go | 0 .../{ => platform}/telemetry/policy_test.go | 0 internal/{ => platform}/telemetry/sink.go | 10 +- .../{ => platform}/telemetry/sink_test.go | 8 +- .../update/application_darwin.go | 0 internal/{ => platform}/update/apply.go | 0 .../{ => platform}/update/apply_darwin.go | 2 +- .../update/apply_darwin_stub.go | 0 .../update/apply_darwin_test.go | 4 +- internal/{ => platform}/update/apply_linux.go | 2 +- .../{ => platform}/update/apply_linux_test.go | 4 +- internal/{ => platform}/update/apply_other.go | 0 .../{ => platform}/update/apply_windows.go | 0 internal/{ => platform}/update/cache.go | 6 +- internal/{ => platform}/update/cache_test.go | 2 +- .../{ => platform}/update/catalog_test.go | 0 .../{ => platform}/update/contentrange.go | 0 .../update/contentrange_test.go | 0 internal/{ => platform}/update/deb.go | 0 internal/{ => platform}/update/deb_linux.go | 0 internal/{ => platform}/update/deb_other.go | 0 internal/{ => platform}/update/deb_test.go | 0 internal/{ => platform}/update/download.go | 0 .../{ => platform}/update/download_test.go | 2 +- .../update/handoff_contract_test.go | 2 +- internal/{ => platform}/update/hub.go | 4 +- .../{ => platform}/update/hub_catalog_test.go | 0 internal/{ => platform}/update/hub_test.go | 0 internal/{ => platform}/update/index.go | 0 internal/{ => platform}/update/index_test.go | 0 internal/{ => platform}/update/install.go | 0 .../{ => platform}/update/install_args.go | 0 .../update/install_args_test.go | 2 +- .../{ => platform}/update/install_other.go | 2 +- .../{ => platform}/update/install_windows.go | 4 +- .../update/install_windows_test.go | 4 +- .../update/installer_run_other.go | 0 .../update/installer_run_windows.go | 0 .../update/installer_run_windows_test.go | 2 +- internal/{ => platform}/update/layout.go | 2 +- internal/{ => platform}/update/line.go | 0 internal/{ => platform}/update/manifest.go | 0 internal/{ => platform}/update/pin.go | 0 internal/{ => platform}/update/pin_test.go | 0 internal/{ => platform}/update/progress.go | 0 .../{ => platform}/update/redirect_test.go | 4 +- .../{ => platform}/update/release_unit.go | 0 .../update/release_unit_test.go | 0 internal/{ => platform}/update/studio_line.go | 0 internal/{ => platform}/update/transport.go | 0 .../{ => platform}/update/transport_test.go | 0 internal/{ => platform}/update/update_test.go | 0 internal/{ => platform}/update/updater.go | 2 +- .../{ => platform}/update/updater_test.go | 0 internal/{ => platform}/update/verify.go | 0 .../{ => platform}/update/windows_payload.go | 0 .../update/windows_payload_test.go | 0 internal/{ => platform}/worktree/worktree.go | 2 +- .../{ => platform}/worktree/worktree_test.go | 4 +- .../worktree/worktree_windows_test.go | 2 +- internal/{ => runtime}/agent/ablation_test.go | 4 +- internal/{ => runtime}/agent/agent.go | 38 +- internal/{ => runtime}/agent/agent_config.go | 0 .../{ => runtime}/agent/agent_config_test.go | 0 internal/{ => runtime}/agent/agent_options.go | 24 +- internal/{ => runtime}/agent/agent_role.go | 0 .../{ => runtime}/agent/argserror_test.go | 6 +- internal/{ => runtime}/agent/ask.go | 2 +- .../{ => runtime}/agent/ask_delegated_test.go | 8 +- internal/{ => runtime}/agent/ask_test.go | 6 +- internal/{ => runtime}/agent/authored_turn.go | 4 +- .../{ => runtime}/agent/authored_turn_test.go | 6 +- internal/{ => runtime}/agent/await_user.go | 2 +- .../{ => runtime}/agent/await_user_test.go | 2 +- .../{ => runtime}/agent/baseline_criteria.go | 6 +- .../agent/baseline_criteria_test.go | 6 +- .../{ => runtime}/agent/baseline_evaluate.go | 4 +- .../agent/baseline_evaluate_test.go | 4 +- .../agent/batch_meta_skip_test.go | 6 +- .../{ => runtime}/agent/blocked_outcome.go | 2 +- .../agent/blocked_tool_e2e_test.go | 8 +- internal/{ => runtime}/agent/branch.go | 6 +- .../agent/branch_sanitize_test.go | 2 +- internal/{ => runtime}/agent/branch_test.go | 4 +- .../{ => runtime}/agent/cache_body_test.go | 2 +- .../agent/cache_diagnostics_test.go | 6 +- internal/{ => runtime}/agent/cache_shape.go | 6 +- .../{ => runtime}/agent/cache_shape_test.go | 2 +- .../{ => runtime}/agent/cachehit_e2e_test.go | 8 +- internal/{ => runtime}/agent/call_contract.go | 0 .../{ => runtime}/agent/call_contract_test.go | 8 +- internal/{ => runtime}/agent/cancel_test.go | 8 +- .../agent/canonical_path_test.go | 2 +- .../agent/canonical_todo_test.go | 6 +- .../agent/capability_alias_test.go | 4 +- .../agent/capability_arguments_test.go | 4 +- .../agent/capability_discovery_test.go | 0 .../{ => runtime}/agent/capability_gate.go | 10 +- .../agent/capability_gate_test.go | 60 +- .../{ => runtime}/agent/capability_lead.go | 2 +- .../agent/capability_lead_test.go | 0 .../{ => runtime}/agent/capability_listing.go | 4 +- .../agent/checkpoint_rejected.go | 0 .../agent/checkpoint_rejected_test.go | 0 .../agent/child_sink_capabilities_test.go | 2 +- internal/{ => runtime}/agent/command_class.go | 6 +- .../{ => runtime}/agent/command_class_test.go | 0 .../agent/commit_covered_test.go | 8 +- internal/{ => runtime}/agent/compact.go | 8 +- .../agent/compact_ablation_test.go | 10 +- .../{ => runtime}/agent/compact_accounting.go | 2 +- .../agent/compact_accounting_test.go | 8 +- .../agent/compact_announce_test.go | 8 +- .../agent/compact_backstop_test.go | 8 +- .../{ => runtime}/agent/compact_commit.go | 2 +- .../agent/compact_commit_emit_test.go | 10 +- .../{ => runtime}/agent/compact_coverage.go | 6 +- .../agent/compact_coverage_test.go | 10 +- .../{ => runtime}/agent/compact_fold_input.go | 4 +- .../agent/compact_fold_input_test.go | 4 +- .../agent/compact_incremental_test.go | 6 +- internal/{ => runtime}/agent/compact_index.go | 6 +- .../{ => runtime}/agent/compact_index_test.go | 4 +- .../agent/compact_longhorizon_test.go | 4 +- .../agent/compact_loop_e2e_test.go | 4 +- .../agent/compact_manual_scope_test.go | 8 +- .../agent/compact_manual_verdict_test.go | 8 +- .../agent/compact_partition_test.go | 2 +- .../agent/compact_plan_bench_test.go | 0 .../{ => runtime}/agent/compact_plan_test.go | 2 +- .../{ => runtime}/agent/compact_projection.go | 6 +- .../agent/compact_raw_output_test.go | 2 +- .../{ => runtime}/agent/compact_recall.go | 6 +- .../agent/compact_recall_test.go | 8 +- .../agent/compact_repair_test.go | 2 +- .../{ => runtime}/agent/compact_retry_test.go | 10 +- .../{ => runtime}/agent/compact_search.go | 6 +- .../agent/compact_search_test.go | 4 +- .../agent/compact_summary_failure_test.go | 8 +- .../agent/compact_tail_trigger_test.go | 8 +- internal/{ => runtime}/agent/compact_test.go | 8 +- .../agent/compact_threshold_test.go | 0 .../{ => runtime}/agent/compact_user_turns.go | 4 +- .../agent/compact_user_turns_test.go | 6 +- .../agent/compaction_budgets_test.go | 8 +- .../agent/complete_step_e2e_test.go | 12 +- .../{ => runtime}/agent/complete_subtask.go | 4 +- .../agent/complete_subtask_test.go | 16 +- .../agent/completion_receipt_test.go | 6 +- .../{ => runtime}/agent/completion_shadow.go | 6 +- .../agent/completion_shadow_test.go | 6 +- .../{ => runtime}/agent/compress_tool_test.go | 8 +- .../{ => runtime}/agent/conclude_blocked.go | 2 +- .../agent/conclude_blocked_test.go | 4 +- .../agent/conclude_no_changes.go | 2 +- .../{ => runtime}/agent/context_breakdown.go | 2 +- .../agent/context_breakdown_test.go | 2 +- .../{ => runtime}/agent/context_budget.go | 2 +- .../agent/context_budget_test.go | 2 +- .../{ => runtime}/agent/context_capsule.go | 0 .../agent/context_capsule_test.go | 2 +- .../agent/context_editing_test.go | 4 +- .../{ => runtime}/agent/context_generation.go | 0 .../context_maintenance_issue7935_test.go | 8 +- .../agent/context_maintenance_restart_test.go | 8 +- .../{ => runtime}/agent/context_manager.go | 2 +- .../agent/context_manager_test.go | 12 +- .../{ => runtime}/agent/context_overflow.go | 2 +- .../agent/context_overflow_test.go | 10 +- .../{ => runtime}/agent/context_receipt.go | 4 +- .../{ => runtime}/agent/context_report.go | 2 +- .../agent/context_report_test.go | 6 +- .../{ => runtime}/agent/context_status.go | 2 +- internal/{ => runtime}/agent/context_usage.go | 2 +- .../{ => runtime}/agent/context_usage_test.go | 8 +- .../agent/contextual_reason_test.go | 4 +- .../agent/contextual_tool_test.go | 6 +- .../{ => runtime}/agent/contract_shadow.go | 10 +- .../agent/contract_shadow_test.go | 2 +- internal/{ => runtime}/agent/coordinator.go | 14 +- .../agent/coordinator_rollback.go | 2 +- .../{ => runtime}/agent/coordinator_test.go | 6 +- .../agent/criteria_receipt_test.go | 8 +- .../agent/criterion_proof_test.go | 6 +- .../agent/declared_check_test.go | 2 +- .../{ => runtime}/agent/delegated_agent.go | 6 +- .../agent/delegation_capability.go | 4 +- .../agent/delegation_capability_test.go | 4 +- .../agent/delegation_lifecycle.go | 4 +- .../agent/delegation_lifecycle_test.go | 14 +- .../agent/delegation_origin_test.go | 10 +- .../agent/delegation_proxy_test.go | 14 +- .../agent/delivery_hardening_test.go | 12 +- .../{ => runtime}/agent/delivery_scope.go | 0 .../agent/delivery_scope_test.go | 8 +- .../agent/delivery_visible_final_test.go | 6 +- .../agent/dependency_barrier_test.go | 4 +- .../agent/dependent_writer_preview_test.go | 10 +- internal/{ => runtime}/agent/dispatch_test.go | 6 +- .../agent/economic_trigger_test.go | 8 +- .../{ => runtime}/agent/empty_final_test.go | 6 +- .../{ => runtime}/agent/empty_session_gc.go | 4 +- .../agent/empty_session_gc_test.go | 2 +- internal/{ => runtime}/agent/errors.go | 0 internal/{ => runtime}/agent/errors_test.go | 0 .../agent/estimation_surface_test.go | 6 +- .../{ => runtime}/agent/evidence_flow_test.go | 10 +- internal/{ => runtime}/agent/execute_batch.go | 10 +- internal/{ => runtime}/agent/execute_one.go | 14 +- .../{ => runtime}/agent/execution_identity.go | 0 .../agent/execution_identity_test.go | 0 .../{ => runtime}/agent/execution_record.go | 6 +- .../agent/execution_record_test.go | 10 +- internal/{ => runtime}/agent/extensions.go | 10 +- .../{ => runtime}/agent/extensions_test.go | 12 +- .../{ => runtime}/agent/failure_diagnosis.go | 4 +- .../agent/failure_diagnosis_test.go | 10 +- internal/{ => runtime}/agent/failure_snip.go | 2 +- .../agent/failure_snip_langs_test.go | 0 .../{ => runtime}/agent/failure_snip_test.go | 4 +- .../agent/failure_survives_folds_test.go | 8 +- .../{ => runtime}/agent/final_readiness.go | 10 +- .../agent/final_readiness_test.go | 10 +- .../agent/final_rejection_test.go | 6 +- internal/{ => runtime}/agent/finalization.go | 4 +- internal/{ => runtime}/agent/fleet.go | 10 +- internal/{ => runtime}/agent/fleet_adopt.go | 0 .../{ => runtime}/agent/fleet_adopt_test.go | 8 +- internal/{ => runtime}/agent/fleet_failure.go | 2 +- .../{ => runtime}/agent/fleet_failure_test.go | 8 +- internal/{ => runtime}/agent/fleet_graph.go | 2 +- .../{ => runtime}/agent/fleet_graph_test.go | 10 +- internal/{ => runtime}/agent/fleet_test.go | 14 +- internal/{ => runtime}/agent/fold_boundary.go | 0 .../{ => runtime}/agent/fold_boundary_test.go | 0 internal/{ => runtime}/agent/format.go | 2 +- internal/{ => runtime}/agent/format_test.go | 0 internal/{ => runtime}/agent/gate_test.go | 6 +- .../agent/goal_boundaries_test.go | 8 +- internal/{ => runtime}/agent/goal_display.go | 0 .../{ => runtime}/agent/goal_display_test.go | 0 .../agent/goal_recorder_isolation_test.go | 6 +- .../{ => runtime}/agent/goal_run_boundary.go | 2 +- internal/{ => runtime}/agent/graph_lone.go | 4 +- .../{ => runtime}/agent/graph_lone_test.go | 10 +- internal/{ => runtime}/agent/graph_publish.go | 4 +- .../{ => runtime}/agent/graph_publish_test.go | 10 +- internal/{ => runtime}/agent/guards_test.go | 8 +- internal/{ => runtime}/agent/hooks_test.go | 8 +- internal/{ => runtime}/agent/host_context.go | 2 +- .../{ => runtime}/agent/host_context_test.go | 8 +- .../{ => runtime}/agent/host_stream_track.go | 2 +- .../agent/host_stream_track_test.go | 2 +- .../agent/interrupted_recovery.go | 2 +- .../{ => runtime}/agent/keep_failure_test.go | 4 +- .../{ => runtime}/agent/kept_projection.go | 2 +- .../agent/kept_projection_test.go | 2 +- .../{ => runtime}/agent/lineage_key_test.go | 2 +- .../agent/listsessions_bench_test.go | 8 +- .../agent/listsessions_sidecar_test.go | 4 +- .../{ => runtime}/agent/live_contract_test.go | 14 +- .../agent/live_deepseek_recovery_test.go | 10 +- .../agent/live_goal_boundary_test.go | 8 +- internal/{ => runtime}/agent/loop_e2e_test.go | 10 +- internal/{ => runtime}/agent/main_test.go | 0 .../{ => runtime}/agent/mcp_concurrency.go | 2 +- .../agent/mcp_concurrency_test.go | 2 +- .../{ => runtime}/agent/mcp_lifetime_test.go | 4 +- .../{ => runtime}/agent/mcp_shared_state.go | 2 +- internal/{ => runtime}/agent/migrate.go | 6 +- .../{ => runtime}/agent/migrate_native.go | 2 +- .../agent/migrate_native_test.go | 6 +- internal/{ => runtime}/agent/migrate_test.go | 4 +- .../agent/missing_reasoning_watch.go | 4 +- .../agent/missing_reasoning_watch_test.go | 8 +- internal/{ => runtime}/agent/nested_sink.go | 2 +- .../agent/nested_sink_double_test.go | 2 +- .../{ => runtime}/agent/nil_boundary_test.go | 4 +- .../agent/noop_reachability_test.go | 10 +- internal/{ => runtime}/agent/normalize.go | 2 +- .../{ => runtime}/agent/obligation_notice.go | 2 +- .../{ => runtime}/agent/ondemandconnect.go | 2 +- .../{ => runtime}/agent/orphan_outputs.go | 2 +- .../agent/orphan_outputs_test.go | 4 +- .../{ => runtime}/agent/outcome_shadow.go | 4 +- .../agent/outcome_shadow_test.go | 4 +- internal/{ => runtime}/agent/outcome_test.go | 6 +- internal/{ => runtime}/agent/output_budget.go | 4 +- .../{ => runtime}/agent/output_budget_test.go | 8 +- .../{ => runtime}/agent/parallel_tasks.go | 6 +- .../agent/parallel_tasks_test.go | 10 +- .../{ => runtime}/agent/path_bound_tools.go | 6 +- .../agent/path_bound_tools_test.go | 12 +- internal/{ => runtime}/agent/path_effect.go | 10 +- .../agent/path_effect_scan_test.go | 2 +- .../{ => runtime}/agent/path_effect_test.go | 4 +- .../agent/permission_projection_test.go | 6 +- internal/{ => runtime}/agent/plan_contract.go | 6 +- .../{ => runtime}/agent/plan_contract_test.go | 20 +- .../{ => runtime}/agent/plan_submission.go | 2 +- .../agent/plan_transition_diff.go | 4 +- .../agent/plan_transition_diff_test.go | 2 +- internal/{ => runtime}/agent/planmode_gate.go | 4 +- internal/{ => runtime}/agent/planmode_test.go | 10 +- .../{ => runtime}/agent/planner_registry.go | 2 +- internal/{ => runtime}/agent/planner_route.go | 0 .../agent/planner_submit_e2e_test.go | 14 +- .../agent/positional_compression_test.go | 6 +- .../agent/postllmcall_flow_test.go | 6 +- internal/{ => runtime}/agent/preflight.go | 2 +- internal/{ => runtime}/agent/preview.go | 6 +- .../{ => runtime}/agent/preview_prose_test.go | 0 internal/{ => runtime}/agent/preview_test.go | 2 +- internal/{ => runtime}/agent/producer_sink.go | 2 +- .../agent/profile_boundary_test.go | 2 +- internal/{ => runtime}/agent/profile_spec.go | 8 +- .../{ => runtime}/agent/profile_spec_test.go | 2 +- .../agent/project_check_probe.go | 4 +- .../agent/project_check_probe_test.go | 10 +- internal/{ => runtime}/agent/projection.go | 6 +- .../agent/projection_authority_test.go | 2 +- .../agent/projection_fastpath_test.go | 2 +- .../agent/projection_fingerprint.go | 2 +- .../agent/projection_fingerprint_test.go | 0 .../{ => runtime}/agent/projection_test.go | 8 +- .../agent/projection_valid_test.go | 8 +- internal/{ => runtime}/agent/provider_tool.go | 4 +- .../{ => runtime}/agent/provider_tool_test.go | 6 +- internal/{ => runtime}/agent/prune.go | 4 +- internal/{ => runtime}/agent/prune_test.go | 6 +- .../agent/readiness_proof_test.go | 4 +- .../{ => runtime}/agent/readiness_salvage.go | 2 +- internal/{ => runtime}/agent/readonly_bash.go | 4 +- .../agent/readonly_bash_block_test.go | 0 .../agent/readonly_handoff_test.go | 6 +- .../{ => runtime}/agent/readonly_subagent.go | 2 +- .../{ => runtime}/agent/reasoning_language.go | 0 .../agent/reasoning_language_test.go | 4 +- .../agent/reasoning_warn_state.go | 4 +- .../agent/reasoning_warn_state_test.go | 4 +- .../agent/recovery_attribution_test.go | 2 +- internal/{ => runtime}/agent/recovery_gate.go | 4 +- .../{ => runtime}/agent/recovery_gate_test.go | 8 +- internal/{ => runtime}/agent/recovery_gc.go | 4 +- .../{ => runtime}/agent/recovery_gc_test.go | 6 +- .../{ => runtime}/agent/recovery_isolated.go | 2 +- .../agent/recovery_isolated_test.go | 4 +- .../{ => runtime}/agent/recovery_lineage.go | 0 .../agent/recovery_lineage_test.go | 4 +- .../agent/refusal_identity_live_test.go | 6 +- .../agent/refusal_identity_test.go | 2 +- .../agent/render_readiness_test.go | 12 +- .../{ => runtime}/agent/response_boundary.go | 2 +- .../agent/response_boundary_test.go | 6 +- .../{ => runtime}/agent/retry_e2e_test.go | 8 +- .../agent/revalidate_projection_test.go | 8 +- .../agent/review_authority_test.go | 20 +- .../agent/review_grant_testutil_test.go | 2 +- internal/{ => runtime}/agent/review_report.go | 4 +- .../{ => runtime}/agent/review_unavailable.go | 0 .../agent/review_unavailable_test.go | 8 +- internal/{ => runtime}/agent/run_budget.go | 4 +- .../{ => runtime}/agent/run_budget_test.go | 6 +- internal/{ => runtime}/agent/run_loop.go | 16 +- internal/{ => runtime}/agent/run_usage.go | 4 +- .../agent/runaway_outcome_test.go | 20 +- .../{ => runtime}/agent/runaway_repro_test.go | 0 .../{ => runtime}/agent/sampling_request.go | 4 +- internal/{ => runtime}/agent/save.go | 10 +- .../{ => runtime}/agent/save_bench_test.go | 2 +- internal/{ => runtime}/agent/save_conflict.go | 2 +- .../agent/save_external_write_test.go | 6 +- .../agent/save_false_diverged_test.go | 4 +- .../agent/save_listing_projection.go | 2 +- .../agent/save_recovery_fanout_test.go | 4 +- .../agent/save_recovery_helpers.go | 2 +- .../agent/save_recovery_projection_test.go | 6 +- .../agent/save_repair_baseline_test.go | 4 +- .../{ => runtime}/agent/save_supersede.go | 2 +- internal/{ => runtime}/agent/save_test.go | 6 +- .../{ => runtime}/agent/scaling_bench_test.go | 4 +- internal/{ => runtime}/agent/scheduler.go | 2 +- .../{ => runtime}/agent/scheduler_test.go | 4 +- .../{ => runtime}/agent/scope_escape_test.go | 10 +- .../agent/secret_redaction_test.go | 4 +- internal/{ => runtime}/agent/services.go | 20 +- internal/{ => runtime}/agent/session.go | 2 +- .../agent/session_checkpoint_agreement.go | 2 +- .../agent/session_checkpoint_lineage_test.go | 6 +- .../agent/session_compat_legacy_test.go | 2 +- .../agent/session_concurrency_test.go | 2 +- .../{ => runtime}/agent/session_content.go | 4 +- .../agent/session_display_index.go | 8 +- .../agent/session_display_index_test.go | 6 +- .../agent/session_display_range.go | 4 +- .../agent/session_display_read_model.go | 4 +- .../agent/session_durability_test.go | 8 +- .../{ => runtime}/agent/session_events.go | 8 +- .../agent/session_events_test.go | 6 +- internal/{ => runtime}/agent/session_lease.go | 6 +- .../agent/session_lease_probe_test.go | 2 +- .../{ => runtime}/agent/session_lease_test.go | 4 +- .../agent/session_listing_helpers.go | 0 .../agent/session_listing_race_test.go | 4 +- .../{ => runtime}/agent/session_lock_unix.go | 2 +- .../agent/session_lock_windows.go | 2 +- .../agent/session_lock_windows_test.go | 2 +- .../agent/session_meta_ledger_test.go | 6 +- .../agent/session_persist_observer.go | 2 +- .../{ => runtime}/agent/session_removal.go | 2 +- .../agent/session_removal_test.go | 6 +- .../agent/session_temp_subagent_test.go | 4 +- internal/{ => runtime}/agent/session_test.go | 4 +- .../agent/session_torn_log_recovery_test.go | 6 +- .../agent/session_write_authority.go | 0 .../agent/session_write_authority_test.go | 2 +- .../{ => runtime}/agent/sessionpreview.go | 2 +- internal/{ => runtime}/agent/sessionstate.go | 4 +- .../{ => runtime}/agent/sessionstate_test.go | 0 .../agent/shell_contract_test.go | 10 +- .../{ => runtime}/agent/shell_shape_gates.go | 2 +- .../{ => runtime}/agent/shell_verification.go | 6 +- internal/{ => runtime}/agent/shown_paths.go | 2 +- .../{ => runtime}/agent/shown_paths_test.go | 4 +- internal/{ => runtime}/agent/silent_exit.go | 2 +- .../{ => runtime}/agent/silent_exit_test.go | 8 +- internal/{ => runtime}/agent/slot.go | 0 .../agent/spawn_boundary_test.go | 18 +- .../agent/stale_anchor_guard_test.go | 6 +- .../{ => runtime}/agent/steer_flush_test.go | 8 +- internal/{ => runtime}/agent/steer_inbox.go | 4 +- .../{ => runtime}/agent/steer_queue_test.go | 0 internal/{ => runtime}/agent/steer_test.go | 0 internal/{ => runtime}/agent/steertext.go | 0 .../agent/stream_attempt_id_test.go | 0 internal/{ => runtime}/agent/sub_registry.go | 2 +- .../agent/subagent_cancel_test.go | 4 +- .../agent/subagent_cleanup_test.go | 4 +- .../agent/subagent_handoff_shadow.go | 4 +- .../{ => runtime}/agent/subagent_identity.go | 2 +- internal/{ => runtime}/agent/subagent_list.go | 2 +- .../{ => runtime}/agent/subagent_list_test.go | 6 +- .../agent/subagent_parent_probe_test.go | 2 +- .../{ => runtime}/agent/subagent_progress.go | 2 +- .../agent/subagent_progress_test.go | 8 +- .../agent/subagent_registry_test.go | 6 +- .../{ => runtime}/agent/subagent_report.go | 6 +- .../agent/subagent_report_test.go | 10 +- .../{ => runtime}/agent/subagent_result.go | 2 +- .../agent/subagent_result_test.go | 6 +- .../{ => runtime}/agent/subagent_store.go | 8 +- .../agent/subagent_store_test.go | 6 +- .../agent/subagent_store_traversal_test.go | 2 +- .../{ => runtime}/agent/subagent_terminal.go | 0 internal/{ => runtime}/agent/submit_plan.go | 4 +- .../{ => runtime}/agent/submit_plan_test.go | 10 +- .../agent/summary_verdict_test.go | 6 +- internal/{ => runtime}/agent/task.go | 24 +- .../agent/task_background_queue_test.go | 12 +- internal/{ => runtime}/agent/task_budget.go | 0 .../agent/task_budget_gate_test.go | 6 +- .../{ => runtime}/agent/task_options_test.go | 6 +- .../{ => runtime}/agent/task_profile_test.go | 8 +- internal/{ => runtime}/agent/task_test.go | 12 +- .../agent/taskpolicy_execution_test.go | 12 +- internal/{ => runtime}/agent/taskstate.go | 2 +- .../{ => runtime}/agent/taskstate_test.go | 2 +- .../agent/testdata/capability_list.json | 0 .../agent/testutil/mock_provider.go | 2 +- .../agent/testutil/mock_provider_test.go | 2 +- internal/{ => runtime}/agent/textsink.go | 6 +- .../agent/textsink_partial_test.go | 2 +- internal/{ => runtime}/agent/textsink_test.go | 4 +- .../agent/textsink_usage_test.go | 2 +- internal/{ => runtime}/agent/title_test.go | 0 internal/{ => runtime}/agent/todo_echo.go | 6 +- .../{ => runtime}/agent/todo_echo_test.go | 8 +- .../agent/todo_progress_shadow.go | 4 +- .../{ => runtime}/agent/todo_projection.go | 4 +- .../agent/todo_projection_test.go | 8 +- internal/{ => runtime}/agent/todo_state.go | 2 +- .../{ => runtime}/agent/tool_call_context.go | 14 +- internal/{ => runtime}/agent/tool_facts.go | 4 +- .../agent/tool_failure_identity_test.go | 2 +- .../{ => runtime}/agent/tool_image_aging.go | 4 +- .../agent/tool_image_aging_test.go | 10 +- .../{ => runtime}/agent/tool_output_spill.go | 8 +- .../agent/tool_output_spill_test.go | 6 +- internal/{ => runtime}/agent/tool_receipts.go | 4 +- .../{ => runtime}/agent/toolimages_test.go | 8 +- .../agent/transient_tags_test.go | 2 +- internal/{ => runtime}/agent/turn_phase.go | 8 +- .../{ => runtime}/agent/turn_phase_test.go | 6 +- internal/{ => runtime}/agent/turnruntime.go | 6 +- .../{ => runtime}/agent/turnruntime_test.go | 0 .../{ => runtime}/agent/upstream_context.go | 0 .../agent/upstream_context_test.go | 12 +- .../agent/usage_accounting_test.go | 8 +- internal/{ => runtime}/agent/usage_context.go | 2 +- internal/{ => runtime}/agent/usage_test.go | 4 +- internal/{ => runtime}/agent/usecapability.go | 10 +- .../agent/usecapability_batching.go | 2 +- .../{ => runtime}/agent/usecapability_hint.go | 2 +- .../agent/usecapability_hint_test.go | 2 +- .../agent/usecapability_search.go | 4 +- .../agent/usecapability_search_test.go | 4 +- .../{ => runtime}/agent/usecapability_test.go | 62 +- internal/{ => runtime}/agent/user_input.go | 0 .../{ => runtime}/agent/user_input_test.go | 6 +- .../agent/verification_class_live_test.go | 10 +- .../{ => runtime}/agent/visible_final_test.go | 6 +- .../{ => runtime}/agent/vision_note_test.go | 0 .../{ => runtime}/agent/vision_routing.go | 0 .../agent/vision_routing_test.go | 0 internal/{ => runtime}/agent/width.go | 0 internal/{ => runtime}/agent/width_test.go | 0 .../{ => runtime}/agent/workspace_block.go | 0 .../agent/workspace_block_test.go | 0 .../agent/workspace_lease_test.go | 12 +- .../{ => runtime}/agent/workspace_mutation.go | 6 +- .../agent/workspace_mutation_test.go | 12 +- internal/{ => runtime}/agent/write_claims.go | 0 .../agent/write_claims_adversarial_test.go | 6 +- .../{ => runtime}/agent/write_claims_test.go | 2 +- internal/{ => runtime}/agent/write_grant.go | 0 .../{ => runtime}/agent/write_grant_test.go | 6 +- .../{ => runtime}/agent/zz_probe2_test.go | 10 +- internal/{ => runtime}/capability/audit.go | 0 .../{ => runtime}/capability/capability.go | 4 +- .../capability/capability_test.go | 4 +- internal/{ => runtime}/capability/catalog.go | 8 +- .../capability/catalog_cache_test.go | 8 +- .../{ => runtime}/capability/catalog_test.go | 0 internal/{ => runtime}/capability/ledger.go | 0 .../{ => runtime}/capability/ledger_test.go | 0 internal/{ => runtime}/capability/semantic.go | 4 +- .../{ => runtime}/capability/semantic_test.go | 4 +- internal/{ => runtime}/completion/claim.go | 2 +- .../{ => runtime}/completion/claim_test.go | 2 +- internal/{ => runtime}/completion/doc.go | 0 internal/{ => runtime}/completion/report.go | 4 +- .../{ => runtime}/completion/report_test.go | 4 +- .../completion/verification_verdict_test.go | 2 +- .../evidence/background_lease.go | 0 internal/{ => runtime}/evidence/baseline.go | 0 .../{ => runtime}/evidence/baseline_test.go | 0 internal/{ => runtime}/evidence/child.go | 0 internal/{ => runtime}/evidence/child_test.go | 16 +- .../evidence/cited_check_test.go | 0 .../{ => runtime}/evidence/commandmatch.go | 2 +- .../evidence/commandmatch_test.go | 4 +- .../evidence/completion_report.go | 0 .../evidence/delegation_audit.go | 0 internal/{ => runtime}/evidence/evidence.go | 2 +- .../{ => runtime}/evidence/evidence_test.go | 0 .../{ => runtime}/evidence/goal_progress.go | 0 .../evidence/goal_progress_test.go | 0 .../{ => runtime}/evidence/ledger_queries.go | 0 internal/{ => runtime}/evidence/meta.go | 0 .../{ => runtime}/evidence/mutation_class.go | 4 +- .../evidence/mutation_class_test.go | 2 +- .../{ => runtime}/evidence/mutation_scan.go | 2 +- .../evidence/mutation_scan_test.go | 0 .../{ => runtime}/evidence/named_paths.go | 0 .../evidence/named_paths_test.go | 2 +- internal/{ => runtime}/evidence/obligation.go | 0 .../{ => runtime}/evidence/obligation_test.go | 0 .../evidence/opaque_interpreter.go | 4 +- internal/{ => runtime}/evidence/outcome.go | 2 +- .../{ => runtime}/evidence/outcome_test.go | 0 internal/{ => runtime}/evidence/path_role.go | 2 +- .../{ => runtime}/evidence/path_role_test.go | 2 +- .../evidence/pipe_status_verdict_test.go | 0 internal/{ => runtime}/evidence/progress.go | 0 .../{ => runtime}/evidence/progress_test.go | 0 .../{ => runtime}/evidence/readiness_audit.go | 0 .../{ => runtime}/evidence/readiness_test.go | 0 internal/{ => runtime}/evidence/receipt.go | 0 internal/{ => runtime}/evidence/render.go | 0 .../{ => runtime}/evidence/render_test.go | 0 .../evidence/review_authority.go | 0 .../evidence/review_authority_test.go | 0 .../{ => runtime}/evidence/review_report.go | 0 internal/{ => runtime}/evidence/risk.go | 2 +- .../evidence/shell_contract_test.go | 0 internal/{ => runtime}/evidence/shown.go | 0 internal/{ => runtime}/evidence/shown_test.go | 0 .../{ => runtime}/evidence/test_criteria.go | 0 .../evidence/test_criteria_test.go | 0 .../{ => runtime}/evidence/testcriteria.go | 0 .../evidence/testcriteria_test.go | 2 +- .../{ => runtime}/evidence/todo_identity.go | 0 .../{ => runtime}/evidence/todo_progress.go | 0 .../evidence/todo_progress_test.go | 0 internal/{ => runtime}/evidence/todos.go | 0 internal/{ => runtime}/evidence/tool_facts.go | 0 internal/{ => runtime}/evidence/user_gate.go | 0 .../evidence/verification_command.go | 4 +- .../evidence/verification_contract.go | 0 .../evidence/verification_exit.go | 4 +- .../evidence/verification_exit_test.go | 0 .../evidence/verification_summary_test.go | 0 .../evidence/whole_command_exit_test.go | 0 internal/{ => runtime}/goaleval/evaluator.go | 8 +- .../{ => runtime}/goaleval/evaluator_test.go | 4 +- internal/{ => runtime}/jobs/artifacts.go | 6 +- internal/{ => runtime}/jobs/artifacts_test.go | 16 +- internal/{ => runtime}/jobs/completion.go | 4 +- .../{ => runtime}/jobs/completion_test.go | 2 +- .../jobs/concurrency_stress_test.go | 2 +- .../jobs/context_isolation_test.go | 0 internal/{ => runtime}/jobs/jobs.go | 8 +- .../{ => runtime}/jobs/jobs_extra_test.go | 2 +- .../{ => runtime}/jobs/jobs_recorder_test.go | 2 +- .../{ => runtime}/jobs/jobs_security_test.go | 6 +- .../jobs/jobs_sessionpath_test.go | 6 +- internal/{ => runtime}/jobs/jobs_test.go | 4 +- internal/{ => runtime}/jobs/main_test.go | 0 .../{ => runtime}/jobs/output_result_test.go | 2 +- internal/{ => runtime}/jobs/progress.go | 0 internal/{ => runtime}/jobs/watch.go | 0 internal/{ => runtime}/jobs/watch_test.go | 2 +- .../{ => runtime}/outputstyle/outputstyle.go | 4 +- .../outputstyle/outputstyle_test.go | 4 +- internal/{ => runtime}/promptrefine/refine.go | 8 +- .../{ => runtime}/promptrefine/refine_test.go | 4 +- .../recovery/cache_shape_test.go | 8 +- internal/{ => runtime}/recovery/decision.go | 0 .../{ => runtime}/recovery/decision_test.go | 0 .../{ => runtime}/recovery/fingerprint.go | 0 internal/{ => runtime}/recovery/gate.go | 2 +- .../{ => runtime}/recovery/gate_restore.go | 0 internal/{ => runtime}/recovery/gate_test.go | 0 internal/{ => runtime}/recovery/persist.go | 6 +- .../{ => runtime}/recovery/persist_test.go | 2 +- internal/{ => runtime}/recovery/reviewer.go | 8 +- .../{ => runtime}/recovery/reviewer_test.go | 4 +- internal/{ => runtime}/recovery/rules.go | 4 +- internal/{ => runtime}/recovery/state.go | 0 internal/{ => runtime}/recovery/types.go | 4 +- internal/{ => runtime}/taskmonitor/control.go | 0 .../{ => runtime}/taskmonitor/control_test.go | 2 +- .../{ => runtime}/taskmonitor/event_tail.go | 0 .../taskmonitor/event_tail_test.go | 2 +- .../taskmonitor/filelock_unix.go | 0 .../taskmonitor/filelock_windows.go | 0 .../{ => runtime}/taskmonitor/jsonstore.go | 2 +- .../taskmonitor/jsonstore_test.go | 2 +- internal/{ => runtime}/taskmonitor/memory.go | 0 internal/{ => runtime}/taskmonitor/model.go | 0 .../{ => runtime}/taskmonitor/model_test.go | 0 .../taskmonitor/projection_sink_test.go | 2 +- .../{ => runtime}/taskmonitor/recorder.go | 2 +- .../taskmonitor/recorder_test.go | 4 +- internal/{ => runtime}/taskmonitor/store.go | 0 internal/{ => runtime}/taskmonitor/tmux.go | 0 .../{ => runtime}/taskmonitor/tmux_test.go | 2 +- internal/{ => runtime}/taskpolicy/context.go | 0 internal/{ => runtime}/taskpolicy/policy.go | 2 +- .../{ => runtime}/taskpolicy/policy_test.go | 2 +- internal/{ => safety}/guardian/guardian.go | 14 +- .../{ => safety}/guardian/guardian_policy.md | 0 .../{ => safety}/guardian/guardian_test.go | 10 +- internal/{ => safety}/guardian/policy.go | 0 internal/{ => safety}/guardian/transcript.go | 2 +- .../{ => safety}/permission/bash_approval.go | 4 +- .../permission/bash_approval_test.go | 0 .../{ => safety}/permission/bash_decompose.go | 2 +- .../permission/bash_decompose_test.go | 0 .../permission/bash_destructive_git_test.go | 0 .../{ => safety}/permission/bash_readonly.go | 2 +- .../permission/bash_readonly_test.go | 0 .../{ => safety}/permission/bash_redirect.go | 2 +- .../permission/bash_redirect_test.go | 0 .../permission/browser_credential.go | 0 .../permission/browser_grant_test.go | 0 internal/{ => safety}/permission/computer.go | 0 .../{ => safety}/permission/computer_test.go | 0 .../{ => safety}/permission/install_source.go | 0 .../permission/install_source_test.go | 0 .../{ => safety}/permission/permission.go | 2 +- .../permission/permission_extra_test.go | 4 +- .../permission/permission_test.go | 0 .../{ => safety}/permission/rule_group.go | 0 internal/{ => safety}/permission/subject.go | 0 .../{ => safety}/permission/write_fence.go | 0 .../permission/write_fence_test.go | 0 .../redirectguard/redirectguard.go | 0 .../redirectguard/redirectguard_test.go | 0 internal/{ => safety}/sandbox/authority.go | 0 .../sandbox/authority_endpoint.go | 0 .../{ => safety}/sandbox/authority_test.go | 0 internal/{ => safety}/sandbox/escape.go | 2 +- .../sandbox/host_authority_test.go | 0 internal/{ => safety}/sandbox/prepare.go | 0 .../{ => safety}/sandbox/prepare_linux.go | 0 .../{ => safety}/sandbox/prepare_other.go | 0 internal/{ => safety}/sandbox/prepare_test.go | 0 internal/{ => safety}/sandbox/sandbox.go | 0 internal/{ => safety}/sandbox/sandbox_test.go | 2 +- .../{ => safety}/sandbox/seatbelt_darwin.go | 0 .../sandbox/seatbelt_darwin_test.go | 2 +- .../{ => safety}/sandbox/seatbelt_other.go | 2 +- .../sandbox/seatbelt_other_test.go | 2 +- .../{ => safety}/sandbox/seatbelt_windows.go | 0 .../sandbox/seatbelt_windows_test.go | 0 .../{ => safety}/sandbox/session_temp_env.go | 0 .../sandbox/session_temp_env_test.go | 0 internal/{ => safety}/sandbox/shell.go | 4 +- .../{ => safety}/sandbox/shell_detect_test.go | 0 .../{ => safety}/sandbox/shell_nul_test.go | 0 .../{ => safety}/shellsafe/bash_redirect.go | 2 +- .../shellsafe/bash_redirect_test.go | 0 .../{ => safety}/shellsafe/inline_code.go | 0 .../shellsafe/inline_code_test.go | 0 .../{ => safety}/shellsafe/readonly_args.go | 0 .../shellsafe/readonly_args_test.go | 0 internal/{ => safety}/shellsafe/shellsafe.go | 2 +- .../{ => safety}/shellsafe/shellsafe_test.go | 0 internal/{ => safety}/typesafe/client.go | 0 internal/{ => safety}/typesafe/client_test.go | 0 .../{ => session}/control/adjudication.go | 6 +- .../control/adjudication_test.go | 10 +- .../control/admission_generation_test.go | 4 +- .../{ => session}/control/admission_guard.go | 4 +- .../{ => session}/control/admission_test.go | 2 +- .../control/adopt_notice_test.go | 8 +- internal/{ => session}/control/approval.go | 6 +- .../{ => session}/control/approval_bridge.go | 10 +- .../control/approval_browser_test.go | 4 +- .../control/approval_computer_test.go | 2 +- .../control/approval_e2e_test.go | 12 +- .../control/approval_mode_test.go | 0 .../control/approval_orchestration.go | 14 +- .../{ => session}/control/ask_e2e_test.go | 10 +- .../{ => session}/control/ask_queue_test.go | 4 +- .../control/attachment_root_test.go | 2 +- internal/{ => session}/control/attachments.go | 2 +- .../{ => session}/control/attachments_test.go | 2 +- internal/{ => session}/control/audit_test.go | 4 +- .../control/auto_plan_e2e_test.go | 8 +- .../control/bash_dynamic_approval_test.go | 12 +- internal/{ => session}/control/boundary.go | 4 +- internal/{ => session}/control/branches.go | 2 +- .../{ => session}/control/branches_test.go | 10 +- .../control/browser_open_test.go | 2 +- internal/{ => session}/control/capability.go | 8 +- .../{ => session}/control/capability_scope.go | 8 +- .../control/capability_scope_test.go | 4 +- .../{ => session}/control/capability_test.go | 8 +- .../control/chat_run_budget_test.go | 10 +- internal/{ => session}/control/checkpoint.go | 12 +- .../control/checkpoint_prompt_test.go | 6 +- .../control/close_idempotent_test.go | 4 +- .../control/compaction_settings.go | 2 +- internal/{ => session}/control/complete.go | 6 +- .../{ => session}/control/complete_test.go | 2 +- .../{ => session}/control/config_problem.go | 2 +- .../control/config_write_approval_test.go | 2 +- .../{ => session}/control/context_command.go | 2 +- .../control/context_command_test.go | 2 +- .../{ => session}/control/context_status.go | 4 +- internal/{ => session}/control/controller.go | 66 +- .../{ => session}/control/controller_deps.go | 32 +- .../control/controller_lock_test.go | 8 +- .../{ => session}/control/controller_test.go | 38 +- internal/{ => session}/control/decisions.go | 2 +- .../{ => session}/control/decisions_test.go | 4 +- .../{ => session}/control/display_prefs.go | 2 +- .../{ => session}/control/docs_command.go | 4 +- internal/{ => session}/control/dropped.go | 0 internal/{ => session}/control/errmsg.go | 8 +- internal/{ => session}/control/errmsg_test.go | 4 +- internal/{ => session}/control/execution.go | 4 +- .../{ => session}/control/execution_graph.go | 8 +- .../{ => session}/control/execution_test.go | 2 +- .../{ => session}/control/extension_ui.go | 4 +- .../control/extension_ui_test.go | 6 +- internal/{ => session}/control/extensions.go | 14 +- .../{ => session}/control/extensions_test.go | 18 +- .../{ => session}/control/external_folders.go | 0 .../control/frontend_sink_capability_test.go | 4 +- internal/{ => session}/control/generation.go | 4 +- internal/{ => session}/control/goal.go | 12 +- .../control/goal_boundary_runtime_test.go | 10 +- .../{ => session}/control/goal_command.go | 2 +- .../control/goal_concurrency_test.go | 6 +- .../control/goal_contract_test.go | 0 .../{ => session}/control/goal_control.go | 4 +- .../{ => session}/control/goal_durable.go | 4 +- .../control/goal_durable_test.go | 6 +- .../control/goal_input_compat_test.go | 0 internal/{ => session}/control/goal_legacy.go | 0 .../control/goal_legacy_restore_test.go | 4 +- .../{ => session}/control/goal_progress.go | 0 .../control/goal_resume_project_check_test.go | 14 +- .../control/goal_run_ceiling_test.go | 8 +- .../control/goal_runtime_test.go | 16 +- .../control/goal_runtime_view.go | 0 .../control/goal_snapshot_contract_test.go | 0 .../control/goal_spend_budget_test.go | 10 +- .../control/goal_state_compat.go | 0 internal/{ => session}/control/goal_test.go | 18 +- .../control/goal_verification.go | 4 +- internal/{ => session}/control/goalusage.go | 4 +- .../control/headless_approval_test.go | 14 +- internal/{ => session}/control/history_log.go | 2 +- internal/{ => session}/control/hooks.go | 2 +- .../control/host_authored_test.go | 12 +- internal/{ => session}/control/inbox.go | 4 +- .../control/inbox_cancel_test.go | 10 +- .../{ => session}/control/inbox_dispatch.go | 2 +- .../control/inbox_dispatch_test.go | 6 +- .../control/inbox_orphan_recovery_test.go | 8 +- internal/{ => session}/control/inbox_refs.go | 2 +- internal/{ => session}/control/inbox_run.go | 2 +- internal/{ => session}/control/inbox_sink.go | 2 +- internal/{ => session}/control/inbox_steer.go | 4 +- internal/{ => session}/control/inbox_test.go | 16 +- internal/{ => session}/control/input.go | 10 +- internal/{ => session}/control/input_test.go | 20 +- .../{ => session}/control/inputimages_test.go | 6 +- internal/{ => session}/control/jobs_bridge.go | 6 +- .../{ => session}/control/jobs_bridge_test.go | 14 +- internal/{ => session}/control/main_test.go | 2 +- internal/{ => session}/control/mcp.go | 4 +- internal/{ => session}/control/mcp_admin.go | 4 +- .../control/mcp_cached_facts_test.go | 6 +- .../{ => session}/control/mcp_catalog_test.go | 2 +- .../{ => session}/control/mcp_remove_oauth.go | 6 +- internal/{ => session}/control/mcp_servers.go | 4 +- internal/{ => session}/control/memory.go | 4 +- .../{ => session}/control/memory_command.go | 8 +- .../control/memory_recall_audit_test.go | 6 +- internal/{ => session}/control/memory_test.go | 4 +- internal/{ => session}/control/network.go | 4 +- .../{ => session}/control/no_runner_test.go | 0 .../{ => session}/control/plan_seed_test.go | 6 +- internal/{ => session}/control/plan_todos.go | 6 +- .../{ => session}/control/planlifecycle.go | 2 +- .../{ => session}/control/planner_gate.go | 6 +- .../control/planner_gate_test.go | 2 +- internal/{ => session}/control/port.go | 28 +- .../control/port_segregation_test.go | 0 internal/{ => session}/control/prefix.go | 2 +- .../control/producer_attribution_test.go | 14 +- .../{ => session}/control/project_modules.go | 0 .../{ => session}/control/projection_bind.go | 4 +- .../control/projection_bind_test.go | 8 +- .../{ => session}/control/projection_debt.go | 0 .../{ => session}/control/prompt_ids_test.go | 2 +- .../{ => session}/control/prompt_refine.go | 4 +- .../control/prompt_refine_test.go | 2 +- .../control/readiness_continuation.go | 6 +- .../control/readiness_continuation_test.go | 10 +- internal/{ => session}/control/recovery.go | 4 +- .../control/recovery_e2e_test.go | 14 +- .../{ => session}/control/recovery_test.go | 14 +- internal/{ => session}/control/refimages.go | 2 +- internal/{ => session}/control/refs.go | 10 +- internal/{ => session}/control/refs_test.go | 4 +- .../control/refusal_hint_test.go | 6 +- .../control/replay_pending_test.go | 2 +- .../control/response_format_test.go | 4 +- .../control/resume_prune_test.go | 8 +- internal/{ => session}/control/rewind.go | 8 +- .../{ => session}/control/rewind_e2e_test.go | 12 +- .../{ => session}/control/rule_allows_test.go | 2 +- internal/{ => session}/control/run_ceiling.go | 4 +- .../control/runtime_status_test.go | 2 +- .../control/session_artifacts_test.go | 10 +- .../{ => session}/control/session_destroy.go | 4 +- .../control/session_grant_test.go | 2 +- .../control/session_lease_keeper.go | 2 +- .../control/session_lease_keeper_test.go | 8 +- .../control/session_lease_reclaim_test.go | 4 +- .../control/session_lifecycle.go | 16 +- .../control/session_readonly_attach_test.go | 6 +- .../{ => session}/control/session_snapshot.go | 18 +- .../control/session_temp_test.go | 8 +- .../control/session_write_authority.go | 4 +- .../session_write_authority_admission_test.go | 8 +- internal/{ => session}/control/sessionpath.go | 4 +- internal/{ => session}/control/shell.go | 8 +- .../{ => session}/control/shell_kill_other.go | 0 .../control/shell_kill_other_test.go | 0 .../control/shell_kill_windows.go | 2 +- .../control/shell_settings_test.go | 4 +- internal/{ => session}/control/shell_test.go | 8 +- internal/{ => session}/control/skill.go | 4 +- .../control/skill_catalog_test.go | 4 +- internal/{ => session}/control/slash.go | 10 +- .../{ => session}/control/slash_catalog.go | 10 +- .../{ => session}/control/slash_resolution.go | 4 +- .../control/slash_resolution_test.go | 4 +- internal/{ => session}/control/slash_test.go | 10 +- .../control/snapshot_conflict_diagnostic.go | 4 +- .../control/snapshot_same_revision.go | 2 +- .../control/steer_delivery_test.go | 12 +- .../control/steer_fallback_test.go | 10 +- .../subagent_goal_work_duration_test.go | 10 +- .../{ => session}/control/synchronous_turn.go | 4 +- .../{ => session}/control/tool_issuer_test.go | 2 +- .../control/turn_boundary_matrix_test.go | 14 +- internal/{ => session}/control/turn_cancel.go | 8 +- .../control/turn_checkpoint_event_test.go | 8 +- .../control/turn_completion_test.go | 2 +- internal/{ => session}/control/turn_entry.go | 14 +- internal/{ => session}/control/turn_gate.go | 0 .../control/turn_identity_test.go | 10 +- internal/{ => session}/control/turn_images.go | 6 +- .../{ => session}/control/turn_images_test.go | 6 +- .../control/turn_orchestrator.go | 16 +- .../control/turn_orchestrator_test.go | 18 +- .../{ => session}/control/turn_projection.go | 8 +- .../control/turn_projection_test.go | 2 +- internal/{ => session}/control/turn_submit.go | 4 +- internal/{ => session}/control/usage_tally.go | 4 +- .../{ => session}/control/usage_tally_test.go | 8 +- internal/{ => session}/control/user_gate.go | 2 +- .../{ => session}/control/user_gate_test.go | 10 +- .../{ => session}/control/workspace_lease.go | 2 +- internal/{ => session}/control/yolo_test.go | 12 +- .../{ => state}/checkpoint/atomic_json.go | 2 +- internal/{ => state}/checkpoint/barrier.go | 0 internal/{ => state}/checkpoint/blob.go | 2 +- internal/{ => state}/checkpoint/capture.go | 2 +- internal/{ => state}/checkpoint/checkpoint.go | 6 +- .../{ => state}/checkpoint/checkpoint_test.go | 6 +- .../{ => state}/checkpoint/file_revert.go | 2 +- internal/{ => state}/checkpoint/nlink_unix.go | 0 .../{ => state}/checkpoint/nlink_windows.go | 0 internal/{ => state}/checkpoint/observer.go | 2 +- .../checkpoint/secure_path_fallback.go | 0 .../checkpoint/secure_path_unix.go | 0 .../{ => state}/checkpoint/transaction.go | 2 +- .../checkpoint/transaction_test.go | 4 +- internal/{ => state}/checkpoint/types.go | 2 +- internal/{ => state}/execgraph/doc.go | 0 internal/{ => state}/execgraph/rebuild.go | 4 +- .../{ => state}/execgraph/rebuild_test.go | 4 +- internal/{ => state}/execjournal/doc.go | 0 internal/{ => state}/execjournal/journal.go | 2 +- .../{ => state}/execjournal/journal_test.go | 2 +- internal/{ => state}/history/indexed.go | 8 +- .../history/indexed_lifecycle_test.go | 4 +- .../{ => state}/history/indexed_rebuild.go | 2 +- .../history/indexed_rebuild_test.go | 4 +- .../history/lifecycle_close_test.go | 4 +- internal/{ => state}/history/search.go | 10 +- internal/{ => state}/history/search_test.go | 8 +- internal/{ => state}/history/strip.go | 2 +- internal/{ => state}/history/tool.go | 4 +- internal/{ => state}/history/tool_test.go | 6 +- .../historycatalog/benchmark_test.go | 0 .../{ => state}/historycatalog/catalog.go | 8 +- .../historycatalog/catalog_test.go | 6 +- .../historycatalog/close_lifecycle_test.go | 0 .../{ => state}/historycatalog/documents.go | 4 +- .../{ => state}/historycatalog/incremental.go | 4 +- .../{ => state}/historycatalog/rebuild.go | 2 +- .../historycatalog/rebuild_test.go | 6 +- .../historycatalog/rebuild_tokenizer_test.go | 4 +- internal/{ => state}/historycatalog/schema.go | 2 +- internal/{ => state}/historycatalog/types.go | 4 +- .../{ => state}/instruction/instruction.go | 0 .../instruction/instruction_test.go | 0 internal/{ => state}/instruction/render.go | 0 internal/{ => state}/instruction/resolver.go | 4 +- .../{ => state}/instruction/resolver_test.go | 2 +- internal/{ => state}/memory/activation.go | 0 .../{ => state}/memory/activation_test.go | 0 internal/{ => state}/memory/auto_recall.go | 2 +- .../{ => state}/memory/auto_recall_test.go | 2 +- .../{ => state}/memory/bounded_name_test.go | 2 +- .../{ => state}/memory/convention_test.go | 2 +- internal/{ => state}/memory/doc.go | 4 +- internal/{ => state}/memory/forget.go | 2 +- internal/{ => state}/memory/forget_test.go | 2 +- internal/{ => state}/memory/freshness.go | 0 internal/{ => state}/memory/freshness_test.go | 0 internal/{ => state}/memory/index.go | 0 .../{ => state}/memory/index_scope_test.go | 0 .../memory/keywords_recall_test.go | 0 internal/{ => state}/memory/memory.go | 2 +- internal/{ => state}/memory/memory_test.go | 4 +- .../{ => state}/memory/prefix_cost_test.go | 2 +- internal/{ => state}/memory/queue.go | 0 .../{ => state}/memory/queue_context_test.go | 0 internal/{ => state}/memory/quickadd.go | 4 +- internal/{ => state}/memory/quickadd_test.go | 2 +- internal/{ => state}/memory/recall.go | 4 +- internal/{ => state}/memory/recall_index.go | 2 +- .../{ => state}/memory/recall_index_test.go | 2 +- internal/{ => state}/memory/recall_test.go | 2 +- internal/{ => state}/memory/remember.go | 2 +- .../{ => state}/memory/remember_policy.go | 2 +- .../memory/remember_policy_test.go | 2 +- internal/{ => state}/memory/remember_test.go | 2 +- internal/{ => state}/memory/render.go | 0 .../{ => state}/memory/shadow_recall_test.go | 0 internal/{ => state}/memory/store.go | 10 +- .../{ => state}/memory/store_extra_test.go | 2 +- internal/{ => state}/memory/store_test.go | 4 +- internal/{ => state}/memory/store_v2.go | 2 +- internal/{ => state}/memory/store_v2_test.go | 2 +- internal/{ => state}/memory/subject.go | 0 internal/{ => state}/memory/subject_test.go | 0 internal/{ => state}/memory/writedoc_test.go | 2 +- internal/{ => state}/migration/migration.go | 6 +- .../{ => state}/migration/migration_test.go | 6 +- .../{ => state}/migration/relocated_state.go | 4 +- .../migration/relocated_state_test.go | 6 +- .../{ => state}/projectiondb/projectiondb.go | 2 +- .../projectiondb/projectiondb_test.go | 4 +- .../projectiondb/remote_fs_darwin.go | 0 .../projectiondb/remote_fs_linux.go | 0 .../projectiondb/remote_fs_other.go | 0 .../projectiondb/remote_fs_windows.go | 0 .../sessioninbox/admission_benchmark_test.go | 2 +- internal/{ => state}/sessioninbox/disk.go | 4 +- internal/{ => state}/sessioninbox/doc.go | 0 .../sessioninbox/idempotency_store.go | 0 internal/{ => state}/sessioninbox/ids.go | 0 internal/{ => state}/sessioninbox/manifest.go | 0 internal/{ => state}/sessioninbox/metrics.go | 0 internal/{ => state}/sessioninbox/ops.go | 0 internal/{ => state}/sessioninbox/recovery.go | 0 .../{ => state}/sessioninbox/recovery_test.go | 2 +- internal/{ => state}/sessioninbox/refs.go | 0 internal/{ => state}/sessioninbox/store.go | 4 +- .../{ => state}/sessioninbox/store_test.go | 6 +- internal/{ => state}/sessioninbox/types.go | 0 internal/{ => state}/sessiontemp/context.go | 0 .../sessiontemp/context_deadline.go | 0 internal/{ => state}/sessiontemp/manager.go | 2 +- .../{ => state}/sessiontemp/manager_test.go | 2 +- .../sessiontemp/manager_test_helpers.go | 2 +- internal/{ => state}/stats/cost_test.go | 2 +- internal/{ => state}/stats/query.go | 4 +- internal/{ => state}/stats/record.go | 4 +- internal/{ => state}/stats/recorder.go | 6 +- internal/{ => state}/stats/stats_test.go | 8 +- internal/{ => state}/stats/usage_catalog.go | 4 +- .../stats/usage_catalog_lifecycle_test.go | 4 +- internal/{ => state}/storage/adopt_test.go | 4 +- internal/{ => state}/storage/marker.go | 2 +- internal/{ => state}/storage/move.go | 4 +- internal/{ => state}/storage/move_test.go | 4 +- internal/{ => state}/storage/preflight.go | 4 +- internal/{ => state}/storage/survey.go | 4 +- internal/{ => state}/storage/survey_test.go | 4 +- internal/{ => state}/storage/volume_unix.go | 0 .../{ => state}/storage/volume_windows.go | 0 internal/{ => state}/store/remote.go | 4 +- internal/{ => state}/store/remote_test.go | 0 .../store/remove_artifacts_test.go | 2 +- internal/{ => state}/store/session.go | 4 +- internal/{ => state}/store/session_test.go | 0 .../{ => state}/store/subagent_name_test.go | 0 .../trajectory/audit_routing_test.go | 4 +- .../{ => state}/trajectory/coalesce_test.go | 6 +- internal/{ => state}/trajectory/recorder.go | 6 +- .../{ => state}/trajectory/recorder_test.go | 6 +- .../usagecatalog/benchmark_test.go | 0 internal/{ => state}/usagecatalog/catalog.go | 6 +- .../{ => state}/usagecatalog/catalog_test.go | 4 +- .../usagecatalog/close_lifecycle_test.go | 2 +- internal/{ => state}/usagecatalog/rebuild.go | 2 +- .../{ => state}/usagecatalog/rebuild_test.go | 2 +- .../{ => state}/usagereport/usagereport.go | 2 +- internal/{ => state}/workgroup/doc.go | 0 internal/{ => state}/workgroup/workgroup.go | 4 +- internal/{ => state}/workspacelease/lease.go | 2 +- .../{ => state}/workspacelease/lease_test.go | 2 +- .../{ => state}/workspacelease/lock_unix.go | 0 .../workspacelease/lock_windows.go | 0 internal/{ => state}/workspacelease/stats.go | 0 .../{ => state}/workspacelease/stats_test.go | 0 internal/{tool => tools}/builtin/bash.go | 18 +- .../builtin/bash_cancel_test.go | 4 +- .../builtin/bash_cancel_windows_test.go | 4 +- .../{tool => tools}/builtin/bash_env_test.go | 6 +- .../{tool => tools}/builtin/bash_external.go | 2 +- .../builtin/bash_external_test.go | 2 +- .../builtin/bash_foreground.go | 6 +- .../builtin/bash_heredoc_test.go | 4 +- internal/{tool => tools}/builtin/bash_nul.go | 2 +- .../{tool => tools}/builtin/bash_nul_test.go | 4 +- .../builtin/bash_powershell_test.go | 6 +- .../{tool => tools}/builtin/bash_reap_test.go | 6 +- .../builtin/bash_sandbox_escape_test.go | 6 +- .../builtin/bash_session_temp_test.go | 6 +- .../builtin/bash_timeout_test.go | 4 +- internal/{tool => tools}/builtin/bgjobs.go | 8 +- .../{tool => tools}/builtin/bgjobs_test.go | 8 +- internal/{tool => tools}/builtin/browser.go | 8 +- .../{tool => tools}/builtin/browser_test.go | 2 +- .../{tool => tools}/builtin/builtin_test.go | 4 +- internal/{tool => tools}/builtin/clientio.go | 0 .../{tool => tools}/builtin/clientio_test.go | 6 +- internal/{tool => tools}/builtin/codeindex.go | 2 +- .../{tool => tools}/builtin/codeindex_test.go | 2 +- .../builtin/codeindex_treesitter.go | 0 .../builtin/codeindex_treesitter_stub.go | 0 .../builtin/codeindex_treesitter_test.go | 2 +- .../{tool => tools}/builtin/completestep.go | 10 +- .../builtin/completestep_test.go | 24 +- internal/{tool => tools}/builtin/compress.go | 2 +- internal/{tool => tools}/builtin/computer.go | 6 +- .../{tool => tools}/builtin/computer_test.go | 4 +- internal/{tool => tools}/builtin/confine.go | 10 +- .../{tool => tools}/builtin/confine_test.go | 12 +- .../{tool => tools}/builtin/contextbudget.go | 2 +- .../builtin/contextual_visibility_test.go | 6 +- .../builtin/criterion_citation_test.go | 2 +- .../{tool => tools}/builtin/crlf_edit_test.go | 2 +- .../{tool => tools}/builtin/delete_range.go | 6 +- .../builtin/delete_range_samedge_test.go | 2 +- .../builtin/delete_range_test.go | 2 +- .../{tool => tools}/builtin/delete_symbol.go | 6 +- .../builtin/delete_symbol_doc_test.go | 2 +- .../builtin/delete_symbol_test.go | 2 +- .../builtin/e2e_encoding_test.go | 4 +- internal/{tool => tools}/builtin/editfile.go | 4 +- .../{tool => tools}/builtin/editsource.go | 2 +- .../builtin/editsource_test.go | 2 +- .../builtin/encoding_helpers.go | 4 +- .../builtin/fuzzy_edit_test.go | 2 +- internal/{tool => tools}/builtin/gitignore.go | 4 +- .../builtin/gitignore_e2e_test.go | 2 +- .../{tool => tools}/builtin/gitignore_test.go | 4 +- internal/{tool => tools}/builtin/glob.go | 6 +- .../{tool => tools}/builtin/glob_root_test.go | 0 internal/{tool => tools}/builtin/grep.go | 14 +- .../builtin/grep_cjk_peek_test.go | 0 .../builtin/grep_engine_test.go | 4 +- .../{tool => tools}/builtin/grep_glob_test.go | 2 +- .../builtin/grep_ignored_test.go | 0 .../{tool => tools}/builtin/host_subject.go | 0 .../builtin/host_subject_test.go | 2 +- .../builtin/image_read_test.go | 2 +- internal/{tool => tools}/builtin/ls.go | 2 +- internal/{tool => tools}/builtin/main_test.go | 0 .../{tool => tools}/builtin/managed_config.go | 2 +- internal/{tool => tools}/builtin/movefile.go | 4 +- .../{tool => tools}/builtin/movefile_other.go | 0 .../builtin/movefile_windows.go | 0 .../builtin/movefile_windows_test.go | 0 internal/{tool => tools}/builtin/multiedit.go | 4 +- .../{tool => tools}/builtin/notebookedit.go | 6 +- .../builtin/notebookedit_test.go | 2 +- .../builtin/pathwriter_test.go | 2 +- .../{tool => tools}/builtin/pipe_status.go | 6 +- .../builtin/pipe_status_test.go | 2 +- .../builtin/post_write_receipt.go | 0 .../builtin/post_write_receipt_test.go | 0 internal/{tool => tools}/builtin/preview.go | 2 +- .../{tool => tools}/builtin/preview_test.go | 6 +- .../builtin/protected_dirs_darwin.go | 0 .../builtin/protected_dirs_darwin_test.go | 0 .../builtin/protected_dirs_other.go | 0 internal/{tool => tools}/builtin/readfile.go | 4 +- .../builtin/readfile_stream_test.go | 2 +- .../builtin/readfile_utf16_test.go | 2 +- .../builtin/readfile_window_test.go | 0 internal/{tool => tools}/builtin/recall.go | 2 +- .../builtin/receipt_hint_test.go | 0 .../builtin/recursive_search_test.go | 2 +- .../builtin/schema_budget.json | 0 .../builtin/schema_budget_test.go | 6 +- .../builtin/sequential_test.go | 2 +- .../{tool => tools}/builtin/session_guard.go | 0 .../builtin/session_guard_test.go | 4 +- .../builtin/sessiontemp_error.go | 0 .../builtin/step_identity_test.go | 2 +- internal/{tool => tools}/builtin/systemone.go | 6 +- .../{tool => tools}/builtin/systemone_test.go | 2 +- .../builtin/terminal_result_test.go | 2 +- internal/{tool => tools}/builtin/timeout.go | 0 internal/{tool => tools}/builtin/todo.go | 4 +- internal/{tool => tools}/builtin/todo_test.go | 4 +- .../builtin/tool_extra_test.go | 2 +- .../{tool => tools}/builtin/updategoal.go | 2 +- .../builtin/updategoal_test.go | 2 +- .../builtin/vendorskip_test.go | 2 +- .../builtin/walk_cancel_test.go | 2 +- .../builtin/web_fetch_proxy_test.go | 2 +- internal/{tool => tools}/builtin/webfetch.go | 4 +- .../builtin/webfetch_ssrf_test.go | 0 internal/{tool => tools}/builtin/workspace.go | 8 +- .../{tool => tools}/builtin/workspace_test.go | 6 +- .../builtin/write_tool_test.go | 2 +- internal/{tool => tools}/builtin/writefile.go | 6 +- internal/{ => tools}/productdocs/docs.go | 4 +- internal/{ => tools}/productdocs/docs_test.go | 2 +- internal/{ => tools}/productdocs/metadata.go | 0 .../sessiontool/sessiontool.go | 6 +- .../sessiontool/sessiontool_test.go | 6 +- internal/{ => tools}/shellrun/decode.go | 2 +- internal/{ => tools}/shellrun/decode_test.go | 0 internal/{ => tools}/shellrun/descriptor.go | 4 +- .../shellrun/progress_suppress_test.go | 0 internal/{ => tools}/shellrun/runner.go | 4 +- internal/{ => tools}/shellrun/runner_test.go | 6 +- internal/{ => tools}/shellrun/subject.go | 2 +- internal/{ => tools}/shellrun/subject_test.go | 4 +- npm/build.mjs | 2 +- reasonix.example.toml | 2 +- scripts/cache-guard.sh | 4 +- scripts/credential-leak-check.mjs | 2 +- scripts/verify-embedded-docs.sh | 2 +- sdk/go/README.md | 4 +- sdk/go/examples/fullsidecar/main.go | 2 +- sdk/go/sdk.go | 2 +- sdk/go/types_ext.go | 2 +- sdk/go/types_generated.go | 2 +- tools/covergate/baseline.json | 30 +- tools/covergate/main.go | 2 +- tools/covergate/main_test.go | 38 +- tools/pricecheck/main.go | 2 +- tools/pricecheck/main_test.go | 2 +- tools/pricecheck/sources.go | 2 +- tools/repolint/baseline.json | 2366 +++++++++-------- tools/repolint/dialect.go | 4 +- tools/repolint/dialect_test.go | 8 +- tools/repolint/docs.go | 4 +- tools/repolint/flatview.go | 20 +- tools/repolint/flatview_test.go | 6 +- tools/repolint/frontendparity.go | 8 +- tools/repolint/frontendparity_test.go | 32 +- tools/repolint/frontendtypes.go | 4 +- tools/repolint/inboxrefusal.go | 4 +- tools/repolint/layer_order.go | 74 + tools/repolint/layer_order_test.go | 39 + tools/repolint/layers.go | 84 +- tools/repolint/layers_test.go | 48 +- tools/repolint/main.go | 3 +- tools/repolint/orphan_test.go | 30 +- tools/repolint/refusal.go | 4 +- tools/repolint/refusal_test.go | 8 +- tools/repolint/size_test.go | 4 +- tools/repolint/source_test.go | 6 +- tools/repolint/tagparity.go | 2 +- tools/repolint/wireparity.go | 64 +- tools/trajectory/README.md | 6 +- tools/workgroupassay/README.md | 2 +- tools/workgroupassay/assay_test.go | 8 +- tools/workgroupassay/main.go | 4 +- tools/workgroupassay/measure.go | 4 +- tools/write_heartbeat/main.go | 4 +- .../src/registry/lib/validation.ts | 2 +- 2952 files changed, 6699 insertions(+), 6491 deletions(-) rename internal/{ => assembly}/boot/ablation_test.go (96%) rename internal/{ => assembly}/boot/add_dir_root_test.go (100%) rename internal/{ => assembly}/boot/agent_graph_effect_test.go (98%) rename internal/{ => assembly}/boot/agent_preset.go (97%) rename internal/{ => assembly}/boot/anthropic_contract_test.go (97%) rename internal/{ => assembly}/boot/assembly_reuse.go (89%) rename internal/{ => assembly}/boot/assembly_reuse_test.go (97%) rename internal/{ => assembly}/boot/audit_forwarding_test.go (87%) rename internal/{ => assembly}/boot/authority_boundary_test.go (98%) rename internal/{ => assembly}/boot/authority_provenance_test.go (98%) rename internal/{ => assembly}/boot/bash_steer_surface_test.go (97%) rename internal/{ => assembly}/boot/boot.go (98%) rename internal/{ => assembly}/boot/boot_safe_mode_test.go (97%) rename internal/{ => assembly}/boot/boot_test.go (99%) rename internal/{ => assembly}/boot/browser.go (90%) rename internal/{ => assembly}/boot/browser_rebuild_test.go (95%) rename internal/{ => assembly}/boot/capability_discovery_effect_test.go (98%) rename internal/{ => assembly}/boot/catalog_host_effect_test.go (96%) rename internal/{ => assembly}/boot/coalesce_wiring_test.go (96%) rename internal/{ => assembly}/boot/compaction_budgets.go (89%) rename internal/{ => assembly}/boot/compaction_retention_effect_test.go (98%) rename internal/{ => assembly}/boot/compress_tool_test.go (95%) rename internal/{ => assembly}/boot/computer.go (85%) rename internal/{ => assembly}/boot/config_home_test.go (96%) rename internal/{ => assembly}/boot/context_budget_effect_test.go (96%) rename internal/{ => assembly}/boot/context_projection_test.go (98%) rename internal/{ => assembly}/boot/costquote_order_test.go (97%) rename internal/{ => assembly}/boot/costquote_wiring.go (90%) rename internal/{ => assembly}/boot/credential_read_test.go (98%) rename internal/{ => assembly}/boot/deepseek_protocol_migration.go (97%) rename internal/{ => assembly}/boot/deepseek_protocol_migration_test.go (98%) rename internal/{ => assembly}/boot/delegation_audit_effect_test.go (94%) rename internal/{ => assembly}/boot/delegation_identity_effect_test.go (97%) rename internal/{ => assembly}/boot/delegation_matrix_test.go (97%) rename internal/{ => assembly}/boot/delegation_tools.go (90%) rename internal/{ => assembly}/boot/doctor_runtime.go (98%) rename internal/{ => assembly}/boot/effect_browser_test.go (97%) rename internal/{ => assembly}/boot/effect_cache_tail_test.go (96%) rename internal/{ => assembly}/boot/effect_computer_test.go (97%) rename internal/{ => assembly}/boot/effect_extension_tool_test.go (95%) rename internal/{ => assembly}/boot/effect_test.go (98%) rename internal/{ => assembly}/boot/effect_tool_images_test.go (97%) rename internal/{ => assembly}/boot/extension_dispatch_test.go (99%) rename internal/{ => assembly}/boot/extension_firstboot_test.go (97%) rename internal/{ => assembly}/boot/extension_provider_test.go (98%) rename internal/{ => assembly}/boot/extension_sidecar_test.go (99%) rename internal/{ => assembly}/boot/extension_tools.go (96%) rename internal/{ => assembly}/boot/extension_ui_gate_test.go (98%) rename internal/{ => assembly}/boot/extension_ui_test.go (98%) rename internal/{ => assembly}/boot/generation_test.go (96%) rename internal/{ => assembly}/boot/goal_contract_effect_test.go (98%) rename internal/{ => assembly}/boot/goal_tool_surface_test.go (96%) rename internal/{ => assembly}/boot/golden_baseline_test.go (97%) rename internal/{ => assembly}/boot/healthy_config.go (96%) rename internal/{ => assembly}/boot/healthy_config_test.go (99%) rename internal/{ => assembly}/boot/helper_test.go (100%) rename internal/{ => assembly}/boot/home_stated_effect_test.go (97%) rename internal/{ => assembly}/boot/hook_notice.go (92%) rename internal/{ => assembly}/boot/install_source.go (93%) rename internal/{ => assembly}/boot/install_source_contract_test.go (97%) rename internal/{ => assembly}/boot/instructions_projection_test.go (98%) rename internal/{ => assembly}/boot/integration_matrix_test.go (95%) rename internal/{ => assembly}/boot/integration_plan_test.go (97%) rename internal/{ => assembly}/boot/kimi_k3_test.go (96%) rename internal/{ => assembly}/boot/main_test.go (86%) rename internal/{ => assembly}/boot/mcp_specs.go (96%) rename internal/{ => assembly}/boot/memoryset.go (92%) rename internal/{ => assembly}/boot/model_error_test.go (98%) rename internal/{ => assembly}/boot/options.go (93%) rename internal/{ => assembly}/boot/phasetimer.go (100%) rename internal/{ => assembly}/boot/pidprobe_unix_test.go (100%) rename internal/{ => assembly}/boot/pidprobe_windows_test.go (100%) rename internal/{ => assembly}/boot/planner_missing_test.go (93%) rename internal/{ => assembly}/boot/planner_override_test.go (89%) rename internal/{ => assembly}/boot/pluginspec.go (92%) rename internal/{ => assembly}/boot/prefix_boundary_effect_test.go (97%) rename internal/{ => assembly}/boot/prompt.go (93%) rename internal/{ => assembly}/boot/prompt_policy.go (94%) rename internal/{ => assembly}/boot/prompt_stability_test.go (96%) rename internal/{ => assembly}/boot/provider_config.go (93%) rename internal/{ => assembly}/boot/rebuild_graph_test.go (93%) rename internal/{ => assembly}/boot/rebuild_subgraph.go (96%) rename internal/{ => assembly}/boot/reload.go (98%) rename internal/{ => assembly}/boot/render_root_test.go (91%) rename internal/{ => assembly}/boot/report.go (92%) rename internal/{ => assembly}/boot/report_test.go (100%) rename internal/{ => assembly}/boot/resolver.go (97%) rename internal/{ => assembly}/boot/resolver_remote_test.go (98%) rename internal/{ => assembly}/boot/review_obligation_test.go (96%) rename internal/{ => assembly}/boot/review_provenance_test.go (98%) rename internal/{ => assembly}/boot/runtime.go (98%) rename internal/{ => assembly}/boot/runtime_owner.go (93%) rename internal/{ => assembly}/boot/runtime_owner_test.go (96%) rename internal/{ => assembly}/boot/runtime_plan.go (97%) rename internal/{ => assembly}/boot/runtime_plan_test.go (96%) rename internal/{ => assembly}/boot/runtime_test.go (99%) rename internal/{ => assembly}/boot/schema_budget_test.go (94%) rename internal/{ => assembly}/boot/scope_wire.go (89%) rename internal/{ => assembly}/boot/session_observer.go (74%) rename internal/{ => assembly}/boot/session_runtime.go (94%) rename internal/{ => assembly}/boot/session_temp_rebuild_test.go (96%) rename internal/{ => assembly}/boot/side_models.go (88%) rename internal/{ => assembly}/boot/skill_activation_test.go (97%) rename internal/{ => assembly}/boot/skill_catalog_effect_test.go (95%) rename internal/{ => assembly}/boot/skill_execution_owner_test.go (96%) rename internal/{ => assembly}/boot/skill_subagent.go (97%) rename internal/{ => assembly}/boot/skills.go (97%) rename internal/{ => assembly}/boot/status_text.go (98%) rename internal/{ => assembly}/boot/stream_router_stage_test.go (95%) rename internal/{ => assembly}/boot/subagent_ablation.go (91%) rename internal/{ => assembly}/boot/subagent_ablation_test.go (98%) rename internal/{ => assembly}/boot/subagent_cleanup_recovery_test.go (97%) rename internal/{ => assembly}/boot/subagent_config.go (95%) rename internal/{ => assembly}/boot/subagent_model_test.go (97%) rename internal/{ => assembly}/boot/superseded_effect_test.go (97%) rename internal/{ => assembly}/boot/switch_reuse_effect_test.go (97%) rename internal/{ => assembly}/boot/system_prompt_file_test.go (98%) rename internal/{ => assembly}/boot/systemone.go (92%) rename internal/{ => assembly}/boot/task_budget.go (90%) rename internal/{ => assembly}/boot/task_budget_test.go (96%) rename internal/{ => assembly}/boot/temphelper_test.go (92%) rename internal/{ => assembly}/boot/testdata/golden/prefix_shape.json (100%) rename internal/{ => assembly}/boot/testdata/golden/provider_request.json (100%) rename internal/{ => assembly}/boot/testdata/golden/system_prompt.txt (100%) rename internal/{ => assembly}/boot/testdata/golden/tool_schemas.json (100%) rename internal/{ => assembly}/boot/token_profile.go (100%) rename internal/{ => assembly}/boot/tool_contract_surface_test.go (99%) rename internal/{ => assembly}/boot/tool_issuer_test.go (98%) rename internal/{ => assembly}/boot/triage.go (91%) rename internal/{ => assembly}/boot/turn_exit_tools.go (91%) rename internal/{ => assembly}/boot/usage_record_effect_test.go (95%) rename internal/{ => assembly}/boot/use_capability_surface_test.go (97%) rename internal/{ => assembly}/boot/window_posture.go (88%) rename internal/{ => assembly}/boot/work_practice_test.go (98%) rename internal/{ => assembly}/boot/workspace.go (100%) rename internal/{ => assembly}/boot/workspace_lease_effect_test.go (96%) rename internal/{ => assembly}/boot/workspace_root_test.go (100%) rename internal/{ => assembly}/boot/zz_probe3_test.go (96%) rename internal/{ => base}/diff/diff.go (100%) rename internal/{ => base}/diff/diff_extra_test.go (100%) rename internal/{ => base}/diff/diff_test.go (100%) rename internal/{ => base}/diff/largediff_test.go (100%) rename internal/{ => base}/filelock/filelock.go (100%) rename internal/{ => base}/filelock/filelock_test.go (98%) rename internal/{ => base}/filelock/lock_unix.go (100%) rename internal/{ => base}/filelock/lock_windows.go (100%) rename internal/{ => base}/fileref/search.go (100%) rename internal/{ => base}/fileref/search_test.go (99%) rename internal/{ => base}/fileref/skip_test.go (97%) rename internal/{ => base}/fileutil/atomicwrite.go (100%) rename internal/{ => base}/fileutil/atomicwrite_test.go (99%) rename internal/{ => base}/fileutil/containment.go (100%) rename internal/{ => base}/fileutil/containment_test.go (100%) rename internal/{ => base}/fileutil/encoding/encoding.go (100%) rename internal/{ => base}/fileutil/encoding/encoding_test.go (99%) rename internal/{ => base}/fileutil/encoding/trim_partial_rune_test.go (100%) rename internal/{ => base}/fileutil/replacefallback_other.go (100%) rename internal/{ => base}/fileutil/replacefallback_windows.go (100%) rename internal/{ => base}/fileutil/replacefallback_windows_test.go (100%) rename internal/{ => base}/fileutil/rootname.go (100%) rename internal/{ => base}/fileutil/rootname_test.go (100%) rename internal/{ => base}/fileutil/slashglob.go (100%) rename internal/{ => base}/fileutil/slashglob_test.go (100%) rename internal/{ => base}/fileutil/vcs.go (100%) rename internal/{ => base}/frontmatter/document.go (100%) rename internal/{ => base}/frontmatter/document_test.go (100%) rename internal/{ => base}/frontmatter/frontmatter.go (100%) rename internal/{ => base}/frontmatter/frontmatter_test.go (100%) rename internal/{ => base}/frontmatter/list_test.go (100%) rename internal/{ => base}/gitignore/excludes.go (100%) rename internal/{ => base}/gitignore/gitignore.go (100%) rename internal/{ => base}/gitignore/gitignore_test.go (94%) rename internal/{ => base}/i18n/catalog_parity_test.go (100%) rename internal/{ => base}/i18n/catalog_test.go (100%) rename internal/{ => base}/i18n/i18n.go (100%) rename internal/{ => base}/i18n/i18n_test.go (100%) rename internal/{ => base}/i18n/messages_en.go (100%) rename internal/{ => base}/i18n/messages_zh.go (100%) rename internal/{ => base}/i18n/messages_zh_tw.go (100%) rename internal/{ => base}/i18n/oslang_other.go (100%) rename internal/{ => base}/i18n/oslang_windows.go (100%) rename internal/{ => base}/netclient/diagnose.go (100%) rename internal/{ => base}/netclient/diagnose_test.go (100%) rename internal/{ => base}/netclient/dialer.go (100%) rename internal/{ => base}/netclient/netclient.go (99%) rename internal/{ => base}/netclient/netclient_test.go (100%) rename internal/{ => base}/neterr/errno_unix.go (100%) rename internal/{ => base}/neterr/errno_windows.go (100%) rename internal/{ => base}/neterr/neterr.go (100%) rename internal/{ => base}/neterr/neterr_test.go (100%) rename internal/{ => base}/nilutil/nil.go (100%) rename internal/{ => base}/nilutil/nil_test.go (100%) rename internal/{ => base}/proc/hide_other.go (100%) rename internal/{ => base}/proc/hide_other_test.go (100%) rename internal/{ => base}/proc/hide_windows.go (100%) rename internal/{ => base}/proc/hide_windows_test.go (100%) rename internal/{ => base}/proc/kill_other.go (100%) rename internal/{ => base}/proc/kill_other_test.go (100%) rename internal/{ => base}/proc/kill_windows.go (100%) rename internal/{ => base}/proc/kill_windows_test.go (100%) rename internal/{ => base}/proc/priority_other.go (100%) rename internal/{ => base}/proc/priority_windows.go (100%) rename internal/{ => base}/proc/priority_windows_test.go (100%) rename internal/{ => base}/proc/run.go (100%) rename internal/{ => base}/proc/run_test.go (100%) rename internal/{ => base}/proc/shell_path_probe_other.go (100%) rename internal/{ => base}/proc/shell_path_probe_windows.go (100%) rename internal/{ => base}/proc/tracked.go (100%) rename internal/{ => base}/proc/tracked_test.go (100%) rename internal/{ => base}/proc/tree_other.go (100%) rename internal/{ => base}/proc/tree_windows.go (100%) rename internal/{ => base}/proc/tree_windows_test.go (100%) rename internal/{ => base}/retrieval/bm25.go (100%) rename internal/{ => base}/retrieval/bm25_test.go (100%) rename internal/{ => base}/retrieval/v2.go (100%) rename internal/{ => base}/retrieval/v2_test.go (100%) rename internal/{ => base}/secrets/credpaths.go (100%) rename internal/{ => base}/secrets/credpaths_test.go (100%) rename internal/{ => base}/secrets/redact.go (99%) rename internal/{ => base}/secrets/redact_test.go (99%) rename internal/{ => base}/shellparse/bash.go (100%) rename internal/{ => base}/shellparse/bash_test.go (100%) rename internal/{ => base}/shellparse/exit_status.go (100%) rename internal/{ => base}/shellparse/heredoc.go (100%) rename internal/{ => base}/shellparse/heredoc_scope_test.go (100%) rename internal/{ => base}/shellparse/mask_test.go (100%) rename internal/{ => base}/shellparse/pipeline.go (100%) rename internal/{ => base}/shellparse/pipeline_test.go (100%) rename internal/{ => base}/sysproxy/sysproxy.go (100%) rename internal/{ => base}/sysproxy/sysproxy_test.go (100%) rename internal/{ => base}/sysproxy/system_other.go (100%) rename internal/{ => base}/sysproxy/system_windows.go (100%) rename internal/{ => base}/tempdir/refusal_other.go (100%) rename internal/{ => base}/tempdir/refusal_windows.go (100%) rename internal/{ => base}/tempdir/refusal_windows_test.go (100%) rename internal/{ => base}/tempdir/tempdir.go (100%) rename internal/{ => base}/tempdir/tempdir_test.go (100%) rename internal/{ => base}/testenv/budget.go (100%) rename internal/{ => base}/testenv/home.go (100%) rename internal/{ => base}/testenv/home_test.go (100%) rename internal/{ => base}/testenv/tempdir.go (100%) rename internal/{ => base}/textutil/bytes.go (100%) rename internal/{ => base}/textutil/display.go (100%) rename internal/{ => base}/textutil/grapheme.go (100%) rename internal/{ => base}/textutil/grapheme_test.go (100%) rename internal/{ => base}/tokencount/tokencount.go (100%) rename internal/{ => base}/tokencount/tokencount_test.go (100%) rename internal/{ => base}/workspaceid/workspaceid.go (100%) rename internal/{ => base}/workspaceid/workspaceid_test.go (99%) rename internal/{ => contract}/ablation/ablation.go (100%) rename internal/{ => contract}/ablation/ablation_test.go (100%) rename internal/{ => contract}/agentgraph/doc.go (100%) rename internal/{ => contract}/agentgraph/graph.go (100%) rename internal/{ => contract}/agentgraph/graph_test.go (100%) rename internal/{ => contract}/agentpreset/matrix_test.go (95%) rename internal/{ => contract}/agentpreset/policy.go (100%) rename internal/{ => contract}/agentpreset/preset.go (100%) rename internal/{ => contract}/agentpreset/preset_test.go (100%) rename internal/{ => contract}/config/activation_mcp.go (100%) rename internal/{ => contract}/config/activation_skill.go (100%) rename internal/{ => contract}/config/activation_trust_test.go (100%) rename internal/{ => contract}/config/agent_roundtrip_test.go (98%) rename internal/{ => contract}/config/anthropic_contract.go (97%) rename internal/{ => contract}/config/apikeyenv.go (100%) rename internal/{ => contract}/config/apikeyenv_test.go (100%) rename internal/{ => contract}/config/appearance_round_trip_test.go (98%) rename internal/{ => contract}/config/backfill_test.go (99%) rename internal/{ => contract}/config/billing.go (99%) rename internal/{ => contract}/config/billing_test.go (94%) rename internal/{ => contract}/config/billing_upgrade_test.go (97%) rename internal/{ => contract}/config/bounded_component_test.go (100%) rename internal/{ => contract}/config/bringforward.go (100%) rename internal/{ => contract}/config/browser.go (100%) rename internal/{ => contract}/config/cache_policy.go (100%) rename internal/{ => contract}/config/cache_policy_test.go (100%) rename internal/{ => contract}/config/capability_activation.go (98%) rename internal/{ => contract}/config/capability_activation_test.go (99%) rename internal/{ => contract}/config/capability_errors.go (100%) rename internal/{ => contract}/config/ccswitch.go (98%) rename internal/{ => contract}/config/ccswitch_test.go (99%) rename internal/{ => contract}/config/chat_model.go (100%) rename internal/{ => contract}/config/chat_model_test.go (100%) rename internal/{ => contract}/config/claudejson.go (98%) rename internal/{ => contract}/config/claudejson_test.go (100%) rename internal/{ => contract}/config/cli_update_channel_test.go (98%) rename internal/{ => contract}/config/commanddirs_test.go (100%) rename internal/{ => contract}/config/config.go (99%) rename internal/{ => contract}/config/configured_test.go (100%) rename internal/{ => contract}/config/credentials.go (99%) rename internal/{ => contract}/config/credentials_keyring_default.go (100%) rename internal/{ => contract}/config/credentials_keyring_helper.go (100%) rename internal/{ => contract}/config/credentials_keyring_timeout_test.go (99%) rename internal/{ => contract}/config/credentials_keyring_unix.go (100%) rename internal/{ => contract}/config/credentials_location_test.go (97%) rename internal/{ => contract}/config/curated_models.go (100%) rename internal/{ => contract}/config/decode.go (97%) rename internal/{ => contract}/config/deepseek_canonical.go (99%) rename internal/{ => contract}/config/deepseek_catalog.go (99%) rename internal/{ => contract}/config/deepseek_catalog_test.go (99%) rename internal/{ => contract}/config/deepseek_peer_fold_test.go (99%) rename internal/{ => contract}/config/deepseek_presets.go (100%) rename internal/{ => contract}/config/deepseek_protocol_migration.go (99%) rename internal/{ => contract}/config/deepseek_protocol_migration_test.go (99%) rename internal/{ => contract}/config/deepseek_vision_fold.go (100%) rename internal/{ => contract}/config/deepseek_vision_fold_test.go (97%) rename internal/{ => contract}/config/default_test.go (100%) rename internal/{ => contract}/config/delivery_paths_test.go (98%) rename internal/{ => contract}/config/desktop_config.go (100%) rename internal/{ => contract}/config/desktop_pin.go (100%) rename internal/{ => contract}/config/desktop_roundtrip_test.go (100%) rename internal/{ => contract}/config/dotenv.go (98%) rename internal/{ => contract}/config/dotenv_test.go (99%) rename internal/{ => contract}/config/edit.go (99%) rename internal/{ => contract}/config/edit_compaction.go (100%) rename internal/{ => contract}/config/edit_shell.go (100%) rename internal/{ => contract}/config/edit_test.go (99%) rename internal/{ => contract}/config/effort.go (99%) rename internal/{ => contract}/config/effort_gpt56_test.go (100%) rename internal/{ => contract}/config/effort_mimo_test.go (100%) rename internal/{ => contract}/config/effort_protocol.go (100%) rename internal/{ => contract}/config/effort_test.go (100%) rename internal/{ => contract}/config/effort_vendor_host_test.go (100%) rename internal/{ => contract}/config/environment_config.go (100%) rename internal/{ => contract}/config/environment_render_test.go (100%) rename internal/{ => contract}/config/expand.go (100%) rename internal/{ => contract}/config/expand_test.go (99%) rename internal/{ => contract}/config/fetch.go (99%) rename internal/{ => contract}/config/fetch_test.go (100%) rename internal/{ => contract}/config/kimi_k3_test.go (99%) rename internal/{ => contract}/config/legacy_providers.go (100%) rename internal/{ => contract}/config/lkg.go (100%) rename internal/{ => contract}/config/lkg_provenance_test.go (98%) rename internal/{ => contract}/config/lkg_test.go (99%) rename internal/{ => contract}/config/load.go (99%) rename internal/{ => contract}/config/load_project_default_test.go (99%) rename internal/{ => contract}/config/loadedit_test.go (98%) rename internal/{ => contract}/config/lsp.go (100%) rename internal/{ => contract}/config/main_test.go (97%) rename internal/{ => contract}/config/mcp_command.go (98%) rename internal/{ => contract}/config/mcp_concurrency_round_trip_test.go (100%) rename internal/{ => contract}/config/mcpjson.go (99%) rename internal/{ => contract}/config/mcpjson_test.go (99%) rename internal/{ => contract}/config/migrate.go (99%) rename internal/{ => contract}/config/migrate_hooks_test.go (97%) rename internal/{ => contract}/config/migrate_test.go (99%) rename internal/{ => contract}/config/model_fallback_test.go (100%) rename internal/{ => contract}/config/model_window.go (100%) rename internal/{ => contract}/config/model_window_test.go (100%) rename internal/{ => contract}/config/mutate.go (99%) rename internal/{ => contract}/config/mutate_test.go (99%) rename internal/{ => contract}/config/official_pricing_test.go (98%) rename internal/{ => contract}/config/passthrough.go (100%) rename internal/{ => contract}/config/passthrough_test.go (98%) rename internal/{ => contract}/config/path_access.go (100%) rename internal/{ => contract}/config/path_isolation_test.go (97%) rename internal/{ => contract}/config/paths.go (99%) rename internal/{ => contract}/config/plugin_entry.go (100%) rename internal/{ => contract}/config/plugin_packages.go (99%) rename internal/{ => contract}/config/plugin_packages_test.go (98%) rename internal/{ => contract}/config/policies.go (100%) rename internal/{ => contract}/config/preset_upgrade.go (100%) rename internal/{ => contract}/config/pricing.go (99%) rename internal/{ => contract}/config/probe.go (100%) rename internal/{ => contract}/config/probe_failure.go (98%) rename internal/{ => contract}/config/probe_key.go (100%) rename internal/{ => contract}/config/probe_test.go (100%) rename internal/{ => contract}/config/protocol.go (100%) rename internal/{ => contract}/config/protocol_declared.go (98%) rename internal/{ => contract}/config/protocol_declared_test.go (98%) rename internal/{ => contract}/config/protocol_test.go (95%) rename internal/{ => contract}/config/provider_isolation_test.go (99%) rename internal/{ => contract}/config/provider_model_rename.go (100%) rename internal/{ => contract}/config/provider_presets.go (99%) rename internal/{ => contract}/config/provider_presets_opencode_go.go (100%) rename internal/{ => contract}/config/provider_presets_test.go (100%) rename internal/{ => contract}/config/proxy_test.go (100%) rename internal/{ => contract}/config/reasoning_display.go (100%) rename internal/{ => contract}/config/reasoning_display_test.go (100%) rename internal/{ => contract}/config/remote.go (100%) rename internal/{ => contract}/config/remote_config_test.go (99%) rename internal/{ => contract}/config/remote_credentials.go (100%) rename internal/{ => contract}/config/render.go (99%) rename internal/{ => contract}/config/render_delegation.go (100%) rename internal/{ => contract}/config/render_desktop.go (100%) rename internal/{ => contract}/config/render_memory.go (100%) rename internal/{ => contract}/config/render_plugin.go (100%) rename internal/{ => contract}/config/render_remote.go (100%) rename internal/{ => contract}/config/render_test.go (99%) rename internal/{ => contract}/config/responses_continuation.go (100%) rename internal/{ => contract}/config/retired_keys.go (98%) rename internal/{ => contract}/config/roles.go (100%) rename internal/{ => contract}/config/safe_mode_test.go (96%) rename internal/{ => contract}/config/sandbox_test.go (100%) rename internal/{ => contract}/config/skill_name.go (100%) rename internal/{ => contract}/config/state_root_entries_test.go (98%) rename internal/{ => contract}/config/storage_config.go (98%) rename internal/{ => contract}/config/storage_roots.go (100%) rename internal/{ => contract}/config/storage_roots_test.go (99%) rename internal/{ => contract}/config/subagent_model_test.go (100%) rename internal/{ => contract}/config/system_prompt_test.go (99%) rename internal/{ => contract}/config/systemone.go (100%) rename internal/{ => contract}/config/systemone_migrate.go (98%) rename internal/{ => contract}/config/systemone_migrate_test.go (100%) rename internal/{ => contract}/config/systemone_test.go (100%) rename internal/{ => contract}/config/systemprompt.go (98%) rename internal/{ => contract}/config/telemetry_test.go (98%) rename internal/{ => contract}/config/thinking_params.go (100%) rename internal/{ => contract}/config/toml_assignment.go (100%) rename internal/{ => contract}/config/tools_test.go (100%) rename internal/{ => contract}/config/unparsed.go (99%) rename internal/{ => contract}/config/unparsed_test.go (99%) rename internal/{ => contract}/config/vision.go (99%) rename internal/{ => contract}/config/vision_offer.go (100%) rename internal/{ => contract}/config/vision_test.go (100%) rename internal/{ => contract}/config/web_search.go (100%) rename internal/{ => contract}/config/web_search_test.go (99%) rename internal/{ => contract}/config/workspace_slug_test.go (100%) rename internal/{ => contract}/event/audit_forwarder.go (96%) rename internal/{ => contract}/event/bound.go (100%) rename internal/{ => contract}/event/cache_diagnostics.go (100%) rename internal/{ => contract}/event/coalesce.go (98%) rename internal/{ => contract}/event/coalesce_test.go (99%) rename internal/{ => contract}/event/completion.go (100%) rename internal/{ => contract}/event/costquote_sink.go (98%) rename internal/{ => contract}/event/costquote_sink_test.go (94%) rename internal/{ => contract}/event/event.go (99%) rename internal/{ => contract}/event/event_test.go (99%) rename internal/{ => contract}/event/extension.go (100%) rename internal/{ => contract}/event/notice_codes.go (100%) rename internal/{ => contract}/event/project_check_probe.go (98%) rename internal/{ => contract}/event/receipt.go (100%) rename internal/{ => contract}/event/receipt_test.go (100%) rename internal/{ => contract}/event/record.go (99%) rename internal/{ => contract}/event/run_budget.go (97%) rename internal/{ => contract}/event/sink_capabilities.go (100%) rename internal/{ => contract}/event/sink_capabilities_test.go (99%) rename internal/{ => contract}/event/subagent_handoff.go (98%) rename internal/{ => contract}/event/subagent_progress.go (100%) rename internal/{ => contract}/event/sync.go (94%) rename internal/{ => contract}/event/tool_cost.go (93%) rename internal/{ => contract}/event/tool_issuer.go (100%) rename internal/{ => contract}/event/verification_drift.go (96%) rename internal/{ => contract}/event/workspace_lease.go (100%) rename internal/{ => contract}/event/workspace_mutation.go (96%) rename internal/{ => contract}/eventwire/attribution.go (90%) rename internal/{ => contract}/eventwire/costquote_compat_test.go (96%) rename internal/{ => contract}/eventwire/extension.go (99%) rename internal/{ => contract}/eventwire/frontend_contract_test.go (95%) rename internal/{ => contract}/eventwire/receipt.go (98%) rename internal/{ => contract}/eventwire/wire.go (99%) rename internal/{ => contract}/eventwire/wire_extension_test.go (99%) rename internal/{ => contract}/eventwire/wire_test.go (98%) rename internal/{ => contract}/eventwire/workspace_lease.go (94%) rename internal/{ => contract}/plancontract/diff.go (100%) rename internal/{ => contract}/plancontract/diff_test.go (100%) rename internal/{ => contract}/plancontract/doc.go (100%) rename internal/{ => contract}/plancontract/order.go (100%) rename internal/{ => contract}/plancontract/order_test.go (100%) rename internal/{ => contract}/plancontract/plan.go (100%) rename internal/{ => contract}/plancontract/plan_test.go (100%) rename internal/{ => contract}/plancontract/project.go (95%) rename internal/{ => contract}/plancontract/project_test.go (98%) rename internal/{ => contract}/plancontract/render.go (100%) rename internal/{ => contract}/plancontract/render_test.go (88%) rename internal/{ => contract}/planmode/context.go (100%) rename internal/{ => contract}/planmode/marker_test.go (100%) rename internal/{ => contract}/planmode/policy.go (100%) rename internal/{ => contract}/planmode/policy_test.go (100%) rename internal/{ => contract}/planmode/reconcile_test.go (96%) rename internal/{ => contract}/planmode/state.go (100%) rename internal/{ => contract}/planmode/state_test.go (100%) rename internal/{ => contract}/provider/chunk.go (100%) rename internal/{ => contract}/provider/config.go (100%) rename internal/{ => contract}/provider/context_overflow.go (100%) rename internal/{ => contract}/provider/context_overflow_test.go (100%) rename internal/{ => contract}/provider/endpoint_anthropic.go (100%) rename internal/{ => contract}/provider/image_data_url.go (100%) rename internal/{ => contract}/provider/image_test.go (100%) rename internal/{ => contract}/provider/local_metadata.go (100%) rename internal/{ => contract}/provider/output_budget.go (100%) rename internal/{ => contract}/provider/pairing_probe_test.go (100%) rename internal/{ => contract}/provider/projection.go (100%) rename internal/{ => contract}/provider/provider.go (99%) rename internal/{ => contract}/provider/provider_test.go (100%) rename internal/{ => contract}/provider/resolver.go (100%) rename internal/{ => contract}/provider/retry.go (100%) rename internal/{ => contract}/provider/retry_test.go (100%) rename internal/{ => contract}/provider/schema_canonicalize.go (100%) rename internal/{ => contract}/provider/schema_canonicalize_test.go (100%) rename internal/{ => contract}/provider/schema_dialect.go (100%) rename internal/{ => contract}/provider/schema_dialect_test.go (100%) rename internal/{ => contract}/provider/schema_error.go (100%) rename internal/{ => contract}/provider/schema_error_test.go (100%) rename internal/{ => contract}/provider/schema_validate.go (100%) rename internal/{ => contract}/provider/schema_validate_test.go (98%) rename internal/{ => contract}/provider/stream_error.go (100%) rename internal/{ => contract}/provider/stream_error_test.go (100%) rename internal/{ => contract}/provider/stream_interrupt_test.go (100%) rename internal/{ => contract}/provider/stream_payload.go (100%) rename internal/{ => contract}/provider/streaminterrupt.go (98%) rename internal/{ => contract}/provider/tool_execution_cache_test.go (100%) rename internal/{ => contract}/provider/usage.go (100%) rename internal/{ => contract}/surface/surface.go (100%) rename internal/{ => contract}/surface/surface_test.go (100%) rename internal/{ => contract}/taskcontract/proof.go (96%) rename internal/{ => contract}/taskcontract/proof_test.go (98%) rename internal/{ => contract}/taskcontract/taskcontract.go (99%) rename internal/{ => contract}/taskcontract/taskcontract_test.go (99%) rename internal/{ => contract}/tool/blocked.go (100%) rename internal/{ => contract}/tool/compress.go (100%) rename internal/{ => contract}/tool/configwrite.go (100%) rename internal/{ => contract}/tool/context_budget.go (100%) rename internal/{ => contract}/tool/contextual_reason_test.go (97%) rename internal/{ => contract}/tool/contract.go (98%) rename internal/{ => contract}/tool/contract_lock_test.go (100%) rename internal/{ => contract}/tool/contract_test.go (95%) rename internal/{ => contract}/tool/goal.go (100%) rename internal/{ => contract}/tool/goal_test.go (100%) rename internal/{ => contract}/tool/permission_args.go (100%) rename internal/{ => contract}/tool/preview_test.go (98%) rename internal/{ => contract}/tool/progress.go (100%) rename internal/{ => contract}/tool/provider_surface_test.go (98%) rename internal/{ => contract}/tool/recall.go (100%) rename internal/{ => contract}/tool/refusal.go (100%) rename internal/{ => contract}/tool/registry_canon_test.go (100%) rename internal/{ => contract}/tool/registry_test.go (100%) rename internal/{ => contract}/tool/resolved.go (100%) rename internal/{ => contract}/tool/shell_execution.go (100%) rename internal/{ => contract}/tool/subagentguard.go (95%) rename internal/{ => contract}/tool/tool.go (99%) rename internal/{ => ext}/command/command.go (98%) rename internal/{ => ext}/command/command_extra_test.go (99%) rename internal/{ => ext}/command/command_test.go (98%) rename internal/{ => ext}/command/inspect.go (100%) rename internal/{ => ext}/command/slashtool.go (99%) rename internal/{ => ext}/command/slashtool_test.go (99%) rename internal/{ => ext}/command/symlink_test.go (97%) rename internal/{ => ext}/extension/adapters.go (95%) rename internal/{ => ext}/extension/bench_threshold_test.go (100%) rename internal/{ => ext}/extension/benchmark_test.go (98%) rename internal/{ => ext}/extension/builder.go (99%) rename internal/{ => ext}/extension/builder_test.go (99%) rename internal/{ => ext}/extension/catalog.go (100%) rename internal/{ => ext}/extension/catalog_test.go (99%) rename internal/{ => ext}/extension/component_status.go (100%) rename internal/{ => ext}/extension/conflict_collect_test.go (100%) rename internal/{ => ext}/extension/conformance/conformance_test.go (98%) rename internal/{ => ext}/extension/conformance/installed_fixture_test.go (97%) rename internal/{ => ext}/extension/conformance/raw_test.go (98%) rename internal/{ => ext}/extension/contributor.go (100%) rename internal/{ => ext}/extension/dependency.go (99%) rename internal/{ => ext}/extension/dependency_test.go (99%) rename internal/{ => ext}/extension/dispatch/benchmark_test.go (97%) rename internal/{ => ext}/extension/dispatch/dispatch.go (99%) rename internal/{ => ext}/extension/dispatch/dispatch_test.go (99%) rename internal/{ => ext}/extension/dispatch/fake_test.go (98%) rename internal/{ => ext}/extension/dispatch/payloads.go (99%) rename internal/{ => ext}/extension/doc.go (91%) rename internal/{ => ext}/extension/effectscope.go (100%) rename internal/{ => ext}/extension/effectscope_test.go (100%) rename internal/{ => ext}/extension/file_compensate.go (100%) rename internal/{ => ext}/extension/file_compensate_test.go (98%) rename internal/{ => ext}/extension/golden_fixtures_test.go (98%) rename internal/{ => ext}/extension/host_stream.go (100%) rename internal/{ => ext}/extension/host_stream_test.go (100%) rename internal/{ => ext}/extension/intercept.go (100%) rename internal/{ => ext}/extension/intercept_test.go (100%) rename internal/{ => ext}/extension/lifecycle.go (100%) rename internal/{ => ext}/extension/manifest_sync_test.go (97%) rename internal/{ => ext}/extension/mcpproxy.go (100%) rename internal/{ => ext}/extension/mcpproxy_test.go (100%) rename internal/{ => ext}/extension/message_dedup.go (100%) rename internal/{ => ext}/extension/message_dedup_test.go (100%) rename internal/{ => ext}/extension/metrics.go (100%) rename internal/{ => ext}/extension/metrics_test.go (100%) rename internal/{ => ext}/extension/protocol/dto_content.go (100%) rename internal/{ => ext}/extension/protocol/dto_intercept.go (100%) rename internal/{ => ext}/extension/protocol/dto_lifecycle.go (100%) rename internal/{ => ext}/extension/protocol/dto_provider.go (99%) rename internal/{ => ext}/extension/protocol/dto_test.go (100%) rename internal/{ => ext}/extension/protocol/dto_tool.go (100%) rename internal/{ => ext}/extension/protocol/dto_ui.go (100%) rename internal/{ => ext}/extension/protocol/dto_view.go (100%) rename internal/{ => ext}/extension/protocol/dto_view_test.go (100%) rename internal/{ => ext}/extension/protocol/enums.go (98%) rename internal/{ => ext}/extension/protocol/errors.go (99%) rename internal/{ => ext}/extension/protocol/errors_test.go (98%) rename internal/{ => ext}/extension/protocol/limits.go (100%) rename internal/{ => ext}/extension/protocol/protocol.go (100%) rename internal/{ => ext}/extension/protocol/protocol_test.go (100%) rename internal/{ => ext}/extension/protocol/registry.go (100%) rename internal/{ => ext}/extension/protocol/registry_test.go (100%) rename internal/{ => ext}/extension/protocol/schema.generated.json (100%) rename internal/{ => ext}/extension/protocol/schema.go (100%) rename internal/{ => ext}/extension/protocol/schema_hash.generated.go (100%) rename internal/{ => ext}/extension/protocol/schema_test.go (100%) rename internal/{ => ext}/extension/protocol/validate.go (100%) rename internal/{ => ext}/extension/protocolgen/generate.go (96%) rename internal/{ => ext}/extension/protocolgen/generate_test.go (97%) rename internal/{ => ext}/extension/protocolgen/sdkgo.go (99%) rename internal/{ => ext}/extension/providerconv/providerconv.go (96%) rename internal/{ => ext}/extension/providerconv/providerconv_test.go (98%) rename internal/{ => ext}/extension/providerext/provider.go (98%) rename internal/{ => ext}/extension/providerext/providerext.go (97%) rename internal/{ => ext}/extension/providerext/providerext_test.go (99%) rename internal/{ => ext}/extension/providerext/stream.go (98%) rename internal/{ => ext}/extension/providerext/stream_lifecycle_test.go (96%) rename internal/{ => ext}/extension/providerext/stream_test.go (99%) rename internal/{ => ext}/extension/proxy.go (100%) rename internal/{ => ext}/extension/proxy_test.go (100%) rename internal/{ => ext}/extension/publish.go (100%) rename internal/{ => ext}/extension/publish_test.go (100%) rename internal/{ => ext}/extension/receipt_store.go (100%) rename internal/{ => ext}/extension/receipt_store_test.go (100%) rename internal/{ => ext}/extension/recovery_policy.go (100%) rename internal/{ => ext}/extension/recovery_policy_test.go (100%) rename internal/{ => ext}/extension/replace.go (99%) rename internal/{ => ext}/extension/replace_test.go (100%) rename internal/{ => ext}/extension/rpcwire/bootstrap.go (100%) rename internal/{ => ext}/extension/rpcwire/bootstrap_test.go (100%) rename internal/{ => ext}/extension/rpcwire/conn.go (100%) rename internal/{ => ext}/extension/rpcwire/conn_strict_regression_test.go (100%) rename internal/{ => ext}/extension/rpcwire/conn_test.go (100%) rename internal/{ => ext}/extension/rpcwire/errors.go (100%) rename internal/{ => ext}/extension/rpcwire/framing.go (100%) rename internal/{ => ext}/extension/rpcwire/stall_test.go (100%) rename internal/{ => ext}/extension/runtime_owner.go (100%) rename internal/{ => ext}/extension/runtime_owner_test.go (99%) rename internal/{ => ext}/extension/runtimeplan.go (99%) rename internal/{ => ext}/extension/runtimeplan_classify_test.go (98%) rename internal/{ => ext}/extension/runtimeplan_test.go (99%) rename internal/{ => ext}/extension/runtimeset.go (100%) rename internal/{ => ext}/extension/runtimeset_test.go (100%) rename internal/{ => ext}/extension/scope_resources.go (100%) rename internal/{ => ext}/extension/scope_resources_test.go (100%) rename internal/{ => ext}/extension/sessionstate.go (99%) rename internal/{ => ext}/extension/sessionstate_test.go (99%) rename internal/{ => ext}/extension/sidecar/benchmark_test.go (97%) rename internal/{ => ext}/extension/sidecar/client.go (99%) rename internal/{ => ext}/extension/sidecar/client_test.go (99%) rename internal/{ => ext}/extension/sidecar/content.go (99%) rename internal/{ => ext}/extension/sidecar/content_test.go (99%) rename internal/{ => ext}/extension/sidecar/doc.go (100%) rename internal/{ => ext}/extension/sidecar/externalize.go (99%) rename internal/{ => ext}/extension/sidecar/externalize_test.go (99%) rename internal/{ => ext}/extension/sidecar/fake_test.go (98%) rename internal/{ => ext}/extension/sidecar/manager.go (98%) rename internal/{ => ext}/extension/sidecar/manager_test.go (98%) rename internal/{ => ext}/extension/sidecar/nth_fail_test.go (93%) rename internal/{ => ext}/extension/sidecar/plan.go (98%) rename internal/{ => ext}/extension/sidecar/plan_test.go (98%) rename internal/{ => ext}/extension/sidecar/probe_client.go (95%) rename internal/{ => ext}/extension/sidecar/process.go (96%) rename internal/{ => ext}/extension/sidecar/process_test.go (98%) rename internal/{ => ext}/extension/sidecar/provides.go (97%) rename internal/{ => ext}/extension/sidecar/stream_router_test.go (98%) rename internal/{ => ext}/extension/sidecar/tools.go (96%) rename internal/{ => ext}/extension/sidecar/tools_test.go (97%) rename internal/{ => ext}/extension/snapshot.go (97%) rename internal/{ => ext}/extension/snapshot_live_test.go (97%) rename internal/{ => ext}/extension/snapshot_test.go (99%) rename internal/{ => ext}/extension/source.go (100%) rename internal/{ => ext}/extension/stale.go (100%) rename internal/{ => ext}/extension/testdata/spatiotemporal-v2/lifecycle.states.golden.json (100%) rename internal/{ => ext}/extension/testdata/spatiotemporal-v2/manifest.v2.golden.json (100%) rename internal/{ => ext}/extension/uihub/hub.go (99%) rename internal/{ => ext}/extension/uihub/hub_test.go (99%) rename internal/{ => ext}/extension/uihub/view_test.go (97%) rename internal/{ => ext}/extensioncontract/capability.go (100%) rename internal/{ => ext}/extensioncontract/capability_test.go (100%) rename internal/{ => ext}/extensioncontract/providerref.go (100%) rename internal/{ => ext}/extensioncontract/providerref_test.go (100%) rename internal/{ => ext}/hook/batch_command_other.go (100%) rename internal/{ => ext}/hook/batch_command_windows.go (100%) rename internal/{ => ext}/hook/command_normalize.go (99%) rename internal/{ => ext}/hook/edit.go (98%) rename internal/{ => ext}/hook/edit_test.go (99%) rename internal/{ => ext}/hook/env_contract.go (98%) rename internal/{ => ext}/hook/execution_contract_test.go (99%) rename internal/{ => ext}/hook/hook.go (99%) rename internal/{ => ext}/hook/hook_test.go (99%) rename internal/{ => ext}/hook/inspect.go (98%) rename internal/{ => ext}/hook/notice_repeat_test.go (98%) rename internal/{ => ext}/hook/posix_syntax.go (97%) rename internal/{ => ext}/hook/posix_syntax_test.go (100%) rename internal/{ => ext}/hook/runner.go (100%) rename internal/{ => ext}/hook/runner_test.go (99%) rename internal/{ => ext}/hook/windows_batch_test.go (98%) rename internal/{ => ext}/hook/windows_compat.go (99%) rename internal/{ => ext}/hook/windows_posix_script.go (99%) rename internal/{ => ext}/hook/windows_posix_script_test.go (98%) rename internal/{ => ext}/installsource/apply.go (99%) rename internal/{ => ext}/installsource/archive.go (100%) rename internal/{ => ext}/installsource/archive_test.go (97%) rename internal/{ => ext}/installsource/doc.go (100%) rename internal/{ => ext}/installsource/errors.go (100%) rename internal/{ => ext}/installsource/http.go (100%) rename internal/{ => ext}/installsource/install_source.go (99%) rename internal/{ => ext}/installsource/install_source_test.go (99%) rename internal/{ => ext}/installsource/mcp.go (99%) rename internal/{ => ext}/installsource/names.go (99%) rename internal/{ => ext}/installsource/plan.go (99%) rename internal/{ => ext}/installsource/plan_ticket_test.go (98%) rename internal/{ => ext}/installsource/plugin_package.go (99%) rename internal/{ => ext}/installsource/plugin_package_windows_test.go (100%) rename internal/{ => ext}/installsource/plugin_runtime_test.go (99%) rename internal/{ => ext}/installsource/skill.go (98%) rename internal/{ => ext}/installsource/ssrf.go (97%) rename internal/{ => ext}/installsource/tarball.go (100%) rename internal/{ => ext}/installsource/tarball_test.go (99%) rename internal/{ => ext}/installsource/types.go (99%) rename internal/{ => ext}/mcpdiag/auth.go (100%) rename internal/{ => ext}/mcpdiag/auth_test.go (100%) rename internal/{ => ext}/mcplaunch/launch.go (99%) rename internal/{ => ext}/mcplaunch/launch_test.go (99%) rename internal/{ => ext}/mcplaunch/process_other.go (100%) rename internal/{ => ext}/mcplaunch/process_unix.go (100%) rename internal/{ => ext}/mcplaunch/process_windows.go (100%) rename internal/{ => ext}/mcplaunch/process_windows_test.go (100%) rename internal/{ => ext}/mcpregistry/registry.go (99%) rename internal/{ => ext}/mcpregistry/registry_test.go (99%) rename internal/{ => ext}/mcpsetup/argv.go (99%) rename internal/{ => ext}/mcpsetup/doc.go (100%) rename internal/{ => ext}/mcpsetup/parse.go (99%) rename internal/{ => ext}/mcpsetup/parse_test.go (100%) rename internal/{ => ext}/mcpsetup/secrets.go (100%) rename internal/{ => ext}/plugin/aux_lifecycle_test.go (100%) rename internal/{ => ext}/plugin/cache.go (98%) rename internal/{ => ext}/plugin/cache_test.go (99%) rename internal/{ => ext}/plugin/cancellation.go (100%) rename internal/{ => ext}/plugin/canonicalize.go (90%) rename internal/{ => ext}/plugin/canonicalize_test.go (99%) rename internal/{ => ext}/plugin/chrome_devtools_live_test.go (97%) rename internal/{ => ext}/plugin/client_close.go (100%) rename internal/{ => ext}/plugin/client_session.go (99%) rename internal/{ => ext}/plugin/codegraph_limit.go (100%) rename internal/{ => ext}/plugin/codegraph_limit_test.go (100%) rename internal/{ => ext}/plugin/deferred_spawn.go (100%) rename internal/{ => ext}/plugin/example_test.go (97%) rename internal/{ => ext}/plugin/failures.go (100%) rename internal/{ => ext}/plugin/failures_status_test.go (100%) rename internal/{ => ext}/plugin/host_concurrency_test.go (100%) rename internal/{ => ext}/plugin/host_queries.go (100%) rename internal/{ => ext}/plugin/hotadd_test.go (100%) rename internal/{ => ext}/plugin/install.go (100%) rename internal/{ => ext}/plugin/instructions_test.go (100%) rename internal/{ => ext}/plugin/known_overrides.go (100%) rename internal/{ => ext}/plugin/launcher_lock.go (99%) rename internal/{ => ext}/plugin/launcher_lock_test.go (99%) rename internal/{ => ext}/plugin/lazy.go (99%) rename internal/{ => ext}/plugin/lazy_test.go (99%) rename internal/{ => ext}/plugin/main_test.go (94%) rename internal/{ => ext}/plugin/oauth.go (99%) rename internal/{ => ext}/plugin/oauth_helpers.go (100%) rename internal/{ => ext}/plugin/oauth_refresh.go (100%) rename internal/{ => ext}/plugin/oauth_refresh_semantics_test.go (99%) rename internal/{ => ext}/plugin/oauth_state.go (98%) rename internal/{ => ext}/plugin/oauth_test.go (99%) rename internal/{ => ext}/plugin/plugin.go (99%) rename internal/{ => ext}/plugin/plugin_test.go (99%) rename internal/{ => ext}/plugin/process_mode_test.go (98%) rename internal/{ => ext}/plugin/prompts.go (100%) rename internal/{ => ext}/plugin/protocol_inbound.go (99%) rename internal/{ => ext}/plugin/proxy.go (100%) rename internal/{ => ext}/plugin/proxy_e2e_test.go (97%) rename internal/{ => ext}/plugin/proxy_test.go (100%) rename internal/{ => ext}/plugin/registration_journal_test.go (100%) rename internal/{ => ext}/plugin/registration_scope.go (100%) rename internal/{ => ext}/plugin/resources.go (100%) rename internal/{ => ext}/plugin/security.go (98%) rename internal/{ => ext}/plugin/startup.go (98%) rename internal/{ => ext}/plugin/startup_cause_test.go (100%) rename internal/{ => ext}/plugin/stats.go (99%) rename internal/{ => ext}/plugin/stats_test.go (99%) rename internal/{ => ext}/plugin/status.go (96%) rename internal/{ => ext}/plugin/status_sink_test.go (97%) rename internal/{ => ext}/plugin/stdio_cancel_test.go (99%) rename internal/{ => ext}/plugin/toolresult_image.go (98%) rename internal/{ => ext}/plugin/toolresult_image_test.go (100%) rename internal/{ => ext}/plugin/transport_concurrency_test.go (100%) rename internal/{ => ext}/plugin/transport_http.go (99%) rename internal/{ => ext}/plugin/transport_http_status_test.go (100%) rename internal/{ => ext}/plugin/transport_http_test.go (99%) rename internal/{ => ext}/plugin/transport_reconnect.go (99%) rename internal/{ => ext}/plugin/transport_sse.go (99%) rename internal/{ => ext}/plugin/transport_sse_test.go (99%) rename internal/{ => ext}/plugin/transport_stdio.go (99%) rename internal/{ => ext}/plugin/transport_stdio_cache_test.go (100%) rename internal/{ => ext}/plugin/transport_stdio_dir_test.go (99%) rename internal/{ => ext}/plugin/transport_stdio_env_test.go (95%) rename internal/{ => ext}/plugin/transport_stdio_other_test.go (100%) rename internal/{ => ext}/plugin/transport_stdio_recovery_test.go (98%) rename internal/{ => ext}/plugin/transport_stdio_wait_test.go (100%) rename internal/{ => ext}/plugin/transport_stdio_windows_test.go (98%) rename internal/{ => ext}/pluginpkg/claude_compat.go (98%) rename internal/{ => ext}/pluginpkg/claude_instructions.go (100%) rename internal/{ => ext}/pluginpkg/compat_legacy_test.go (99%) rename internal/{ => ext}/pluginpkg/describe.go (100%) rename internal/{ => ext}/pluginpkg/export.go (100%) rename internal/{ => ext}/pluginpkg/export_test.go (99%) rename internal/{ => ext}/pluginpkg/hook_contract_test.go (99%) rename internal/{ => ext}/pluginpkg/installed_compat.go (100%) rename internal/{ => ext}/pluginpkg/manifest_v1.go (99%) rename internal/{ => ext}/pluginpkg/manifest_v1_test.go (99%) rename internal/{ => ext}/pluginpkg/manifest_v2.go (99%) rename internal/{ => ext}/pluginpkg/manifest_v2_test.go (99%) rename internal/{ => ext}/pluginpkg/pluginpkg.go (98%) rename internal/{ => ext}/pluginpkg/pluginpkg_test.go (99%) rename internal/{ => ext}/pluginpkg/state_lock_test.go (99%) rename internal/{ => ext}/pluginspec/pluginspec.go (98%) rename internal/{ => ext}/pluginspec/pluginspec_test.go (98%) rename internal/{ => ext}/skill/authority.go (100%) rename internal/{ => ext}/skill/authority_boundary_test.go (99%) rename internal/{ => ext}/skill/builtin_embed.go (96%) rename internal/{ => ext}/skill/builtincontent/embed.go (98%) rename internal/{ => ext}/skill/builtincontent/embed_test.go (95%) rename internal/{ => ext}/skill/builtincontent/reasonix-guide/SKILL.md (100%) rename internal/{ => ext}/skill/builtins.go (99%) rename internal/{ => ext}/skill/builtins_test.go (99%) rename internal/{ => ext}/skill/delivery.go (100%) rename internal/{ => ext}/skill/delivery_frontmatter.go (98%) rename internal/{ => ext}/skill/frontmatter_keys.go (100%) rename internal/{ => ext}/skill/index.go (99%) rename internal/{ => ext}/skill/inspect.go (98%) rename internal/{ => ext}/skill/main_test.go (76%) rename internal/{ => ext}/skill/notfound.go (100%) rename internal/{ => ext}/skill/profile.go (98%) rename internal/{ => ext}/skill/reasonix_guide_test.go (97%) rename internal/{ => ext}/skill/skill.go (99%) rename internal/{ => ext}/skill/skill_extra_test.go (99%) rename internal/{ => ext}/skill/skill_test.go (99%) rename internal/{ => ext}/skill/tools.go (99%) rename internal/{ => ext}/skill/tools_test.go (99%) rename internal/{ => ext}/theme/asset.go (100%) rename internal/{ => ext}/theme/asset_test.go (99%) rename internal/{ => ext}/theme/builtin/official-cloudsea-gilt.json (100%) rename internal/{ => ext}/theme/builtin/official-crimson-horizon.background.webp (100%) rename internal/{ => ext}/theme/builtin/official-crimson-horizon.json (100%) rename internal/{ => ext}/theme/builtin/official-crimson-horizon.preview.webp (100%) rename internal/{ => ext}/theme/builtin/official-cyan-stage.background.webp (100%) rename internal/{ => ext}/theme/builtin/official-cyan-stage.json (100%) rename internal/{ => ext}/theme/builtin/official-cyan-stage.preview.webp (100%) rename internal/{ => ext}/theme/builtin/official-fortune-forge.background.webp (100%) rename internal/{ => ext}/theme/builtin/official-fortune-forge.json (100%) rename internal/{ => ext}/theme/builtin/official-fortune-forge.preview.webp (100%) rename internal/{ => ext}/theme/builtin/official-noir-gold.background.webp (100%) rename internal/{ => ext}/theme/builtin/official-noir-gold.json (100%) rename internal/{ => ext}/theme/builtin/official-noir-gold.preview.webp (100%) rename internal/{ => ext}/theme/builtin/official-rose-dawn.background.webp (100%) rename internal/{ => ext}/theme/builtin/official-rose-dawn.json (100%) rename internal/{ => ext}/theme/builtin/official-rose-dawn.preview.webp (100%) rename internal/{ => ext}/theme/builtin/official-sage-breeze.background.webp (100%) rename internal/{ => ext}/theme/builtin/official-sage-breeze.json (100%) rename internal/{ => ext}/theme/builtin/official-sage-breeze.preview.webp (100%) rename internal/{ => ext}/theme/builtin/official-spark-notebook.background.webp (100%) rename internal/{ => ext}/theme/builtin/official-spark-notebook.json (100%) rename internal/{ => ext}/theme/builtin/official-spark-notebook.preview.webp (100%) rename internal/{ => ext}/theme/builtin/official-violet-starlight.background.webp (100%) rename internal/{ => ext}/theme/builtin/official-violet-starlight.json (100%) rename internal/{ => ext}/theme/builtin/official-violet-starlight.preview.webp (100%) rename internal/{ => ext}/theme/plugin.go (95%) rename internal/{ => ext}/theme/plugin_test.go (96%) rename internal/{ => ext}/theme/theme.go (99%) rename internal/{ => ext}/theme/theme_test.go (99%) rename internal/{ => ext}/theme/tokens.go (100%) rename internal/{ => ext}/theme/tokens_test.go (98%) rename internal/{ => frontend}/acp/client_integration_test.go (98%) rename internal/{ => frontend}/acp/clientio.go (99%) rename internal/{ => frontend}/acp/dispatch.go (98%) rename internal/{ => frontend}/acp/dispatch_extension_test.go (98%) rename internal/{ => frontend}/acp/dispatch_partial_test.go (96%) rename internal/{ => frontend}/acp/dispatch_test.go (99%) rename internal/{ => frontend}/acp/e2e_test.go (98%) rename internal/{ => frontend}/acp/extension_models.go (96%) rename internal/{ => frontend}/acp/extension_models_test.go (96%) rename internal/{ => frontend}/acp/inbox.go (98%) rename internal/{ => frontend}/acp/inbox_drain.go (95%) rename internal/{ => frontend}/acp/inbox_drain_test.go (95%) rename internal/{ => frontend}/acp/live_test.go (91%) rename internal/{ => frontend}/acp/protocol.go (100%) rename internal/{ => frontend}/acp/protocol_test.go (99%) rename internal/{ => frontend}/acp/reload_extensions_test.go (98%) rename internal/{ => frontend}/acp/role_switch_race_test.go (94%) rename internal/{ => frontend}/acp/server.go (100%) rename internal/{ => frontend}/acp/server_test.go (99%) rename internal/{ => frontend}/acp/service.go (99%) rename internal/{ => frontend}/acp/service_lease_test.go (95%) rename internal/{ => frontend}/acp/service_lock_test.go (99%) rename internal/{ => frontend}/acp/session.go (99%) rename internal/{ => frontend}/acp/session_config.go (99%) rename internal/{ => frontend}/acp/session_files_test.go (90%) rename internal/{ => frontend}/acp/session_meta.go (97%) rename internal/{ => frontend}/acp/session_write_authority.go (98%) rename internal/{ => frontend}/acp/status.go (99%) rename internal/{ => frontend}/acp/status_test.go (98%) rename internal/{ => frontend}/acp/switch_recovery_test.go (99%) rename internal/{ => frontend}/acp/terminal_env_test.go (100%) rename internal/{ => frontend}/capdiag/collect.go (98%) rename internal/{ => frontend}/capdiag/collect_test.go (99%) rename internal/{ => frontend}/capdiag/collect_v1_test.go (97%) rename internal/{ => frontend}/capdiag/hook_issues.go (98%) rename internal/{ => frontend}/capdiag/hook_runtime_test.go (97%) rename internal/{ => frontend}/capdiag/live.go (97%) rename internal/{ => frontend}/capdiag/paths.go (100%) rename internal/{ => frontend}/capdiag/render.go (100%) rename internal/{ => frontend}/capdiag/sanitize_test.go (98%) rename internal/{ => frontend}/capdiag/types.go (99%) rename internal/{ => frontend}/cli/account.go (97%) rename internal/{ => frontend}/cli/acp.go (97%) rename internal/{ => frontend}/cli/acp_extension_test.go (97%) rename internal/{ => frontend}/cli/acp_test.go (97%) rename internal/{ => frontend}/cli/ansi_console_other.go (100%) rename internal/{ => frontend}/cli/ansi_console_windows.go (100%) rename internal/{ => frontend}/cli/bench_flags.go (93%) rename internal/{ => frontend}/cli/box.go (100%) rename internal/{ => frontend}/cli/box_test.go (100%) rename internal/{ => frontend}/cli/branch.go (100%) rename internal/{ => frontend}/cli/branch_test.go (100%) rename internal/{ => frontend}/cli/build_options.go (92%) rename internal/{ => frontend}/cli/buildinfo.go (100%) rename internal/{ => frontend}/cli/buildinfo_test.go (100%) rename internal/{ => frontend}/cli/catalogs.go (98%) rename internal/{ => frontend}/cli/catalogs_history.go (95%) rename internal/{ => frontend}/cli/catalogs_usage.go (90%) rename internal/{ => frontend}/cli/cli.go (99%) rename internal/{ => frontend}/cli/cli_flags.go (99%) rename internal/{ => frontend}/cli/cli_flags_test.go (98%) rename internal/{ => frontend}/cli/cli_test.go (99%) rename internal/{ => frontend}/cli/complete.go (100%) rename internal/{ => frontend}/cli/context_window_prompt_test.go (100%) rename internal/{ => frontend}/cli/currency.go (100%) rename internal/{ => frontend}/cli/default_model.go (96%) rename internal/{ => frontend}/cli/delegation_metrics_test.go (98%) rename internal/{ => frontend}/cli/diffview.go (99%) rename internal/{ => frontend}/cli/diffview_test.go (99%) rename internal/{ => frontend}/cli/docs_manifest.go (98%) rename internal/{ => frontend}/cli/doctor.go (98%) rename internal/{ => frontend}/cli/doctor_capabilities.go (98%) rename internal/{ => frontend}/cli/doctor_capabilities_test.go (97%) rename internal/{ => frontend}/cli/doctor_repair_test.go (96%) rename internal/{ => frontend}/cli/doctor_runtime.go (94%) rename internal/{ => frontend}/cli/doctor_test.go (98%) rename internal/{ => frontend}/cli/extension_surface.go (97%) rename internal/{ => frontend}/cli/extension_surface_test.go (98%) rename internal/{ => frontend}/cli/flag_parse.go (98%) rename internal/{ => frontend}/cli/flag_parse_test.go (100%) rename internal/{ => frontend}/cli/gitstatus.go (96%) rename internal/{ => frontend}/cli/gitstatus_test.go (97%) rename internal/{ => frontend}/cli/help_view.go (95%) rename internal/{ => frontend}/cli/hide_other.go (100%) rename internal/{ => frontend}/cli/hide_windows.go (100%) rename internal/{ => frontend}/cli/hook_machine.go (99%) rename internal/{ => frontend}/cli/hook_machine_test.go (98%) rename internal/{ => frontend}/cli/hooks_view.go (96%) rename internal/{ => frontend}/cli/latex.go (100%) rename internal/{ => frontend}/cli/latex_test.go (100%) rename internal/{ => frontend}/cli/machine_identity_test.go (99%) rename internal/{ => frontend}/cli/main_test.go (90%) rename internal/{ => frontend}/cli/mathnode.go (100%) rename internal/{ => frontend}/cli/mcp.go (98%) rename internal/{ => frontend}/cli/mcp_manager.go (100%) rename internal/{ => frontend}/cli/mcp_manager_actions.go (100%) rename internal/{ => frontend}/cli/mcp_oauth.go (94%) rename internal/{ => frontend}/cli/mcp_oauth_test.go (96%) rename internal/{ => frontend}/cli/mcp_remove_helpers.go (85%) rename internal/{ => frontend}/cli/mcp_remove_test.go (92%) rename internal/{ => frontend}/cli/mcp_view.go (99%) rename internal/{ => frontend}/cli/md.go (100%) rename internal/{ => frontend}/cli/md_cjk_test.go (100%) rename internal/{ => frontend}/cli/md_test.go (100%) rename internal/{ => frontend}/cli/memory_view.go (71%) rename internal/{ => frontend}/cli/model.go (91%) rename internal/{ => frontend}/cli/model_view.go (94%) rename internal/{ => frontend}/cli/notifications.go (80%) rename internal/{ => frontend}/cli/output_style_view.go (95%) rename internal/{ => frontend}/cli/plugin.go (98%) rename internal/{ => frontend}/cli/plugin_slash_test.go (100%) rename internal/{ => frontend}/cli/plugin_test.go (95%) rename internal/{ => frontend}/cli/plugin_v1_test.go (98%) rename internal/{ => frontend}/cli/provider_context_window.go (96%) rename internal/{ => frontend}/cli/provider_wizard.go (99%) rename internal/{ => frontend}/cli/quick_picker.go (100%) rename internal/{ => frontend}/cli/reasoning_language.go (100%) rename internal/{ => frontend}/cli/recovery_gc.go (94%) rename internal/{ => frontend}/cli/recovery_machine_test.go (93%) rename internal/{ => frontend}/cli/remote.go (98%) rename internal/{ => frontend}/cli/remote_broker.go (84%) rename internal/{ => frontend}/cli/remote_cmd_test.go (99%) rename internal/{ => frontend}/cli/remote_connect.go (98%) rename internal/{ => frontend}/cli/remote_serve_url.go (100%) rename internal/{ => frontend}/cli/remote_serve_url_test.go (93%) rename internal/{ => frontend}/cli/rename_test.go (97%) rename internal/{ => frontend}/cli/render_edge_test.go (98%) rename internal/{ => frontend}/cli/report.go (97%) rename internal/{ => frontend}/cli/report_test.go (97%) rename internal/{ => frontend}/cli/resume.go (93%) rename internal/{ => frontend}/cli/resume_picker.go (94%) rename internal/{ => frontend}/cli/retry_indicator_test.go (95%) rename internal/{ => frontend}/cli/review.go (96%) rename internal/{ => frontend}/cli/review_test.go (97%) rename internal/{ => frontend}/cli/run_completion.go (96%) rename internal/{ => frontend}/cli/run_completion_test.go (96%) rename internal/{ => frontend}/cli/run_failure_report_test.go (100%) rename internal/{ => frontend}/cli/run_graph_metrics.go (98%) rename internal/{ => frontend}/cli/run_graph_metrics_test.go (98%) rename internal/{ => frontend}/cli/run_metrics.go (99%) rename internal/{ => frontend}/cli/run_metrics_cost.go (99%) rename internal/{ => frontend}/cli/run_metrics_cost_test.go (99%) rename internal/{ => frontend}/cli/run_metrics_partial_test.go (98%) rename internal/{ => frontend}/cli/run_metrics_test.go (98%) rename internal/{ => frontend}/cli/run_output.go (99%) rename internal/{ => frontend}/cli/run_output_test.go (99%) rename internal/{ => frontend}/cli/run_sink.go (92%) rename internal/{ => frontend}/cli/scroll_state.go (100%) rename internal/{ => frontend}/cli/select.go (99%) rename internal/{ => frontend}/cli/select_test.go (100%) rename internal/{ => frontend}/cli/serve_broker.go (98%) rename internal/{ => frontend}/cli/serve_broker_test.go (98%) rename internal/{ => frontend}/cli/serve_files.go (96%) rename internal/{ => frontend}/cli/serve_files_test.go (98%) rename internal/{ => frontend}/cli/serve_frontend.go (98%) rename internal/{ => frontend}/cli/serve_provider_setup_test.go (99%) rename internal/{ => frontend}/cli/session_lease.go (97%) rename internal/{ => frontend}/cli/session_machine.go (98%) rename internal/{ => frontend}/cli/session_machine_test.go (97%) rename internal/{ => frontend}/cli/setup_manager.go (99%) rename internal/{ => frontend}/cli/setup_manager_test.go (99%) rename internal/{ => frontend}/cli/shell_completion.go (99%) rename internal/{ => frontend}/cli/shell_completion_test.go (100%) rename internal/{ => frontend}/cli/skill_picker.go (100%) rename internal/{ => frontend}/cli/skill_picker_view.go (100%) rename internal/{ => frontend}/cli/skill_view.go (98%) rename internal/{ => frontend}/cli/slash_registry.go (99%) rename internal/{ => frontend}/cli/slash_registry_test.go (100%) rename internal/{ => frontend}/cli/style.go (100%) rename internal/{ => frontend}/cli/style_profile_test.go (100%) rename internal/{ => frontend}/cli/subagent.go (98%) rename internal/{ => frontend}/cli/subagent_handoff_metrics_test.go (98%) rename internal/{ => frontend}/cli/subagent_test.go (98%) rename internal/{ => frontend}/cli/task.go (99%) rename internal/{ => frontend}/cli/task_machine.go (99%) rename internal/{ => frontend}/cli/task_machine_test.go (97%) rename internal/{ => frontend}/cli/task_test.go (99%) rename internal/{ => frontend}/cli/theme.go (100%) rename internal/{ => frontend}/cli/theme_osc_other.go (100%) rename internal/{ => frontend}/cli/theme_osc_unix.go (100%) rename internal/{ => frontend}/cli/theme_sweep.go (100%) rename internal/{ => frontend}/cli/theme_sweep_test.go (100%) rename internal/{ => frontend}/cli/theme_test.go (100%) rename internal/{ => frontend}/cli/toolcard.go (99%) rename internal/{ => frontend}/cli/toolcard_test.go (100%) rename internal/{ => frontend}/cli/transcript.go (100%) rename internal/{ => frontend}/cli/transcript_test.go (100%) rename internal/{ => frontend}/cli/tui_diagnostics.go (100%) rename internal/{ => frontend}/cli/turn_failure.go (100%) rename internal/{ => frontend}/cli/turn_failure_test.go (100%) rename internal/{ => frontend}/cli/upgrade.go (99%) rename internal/{ => frontend}/cli/upgrade_test.go (99%) rename internal/{ => frontend}/cli/upgrade_token_test.go (100%) rename internal/{ => frontend}/cli/usage_catalog_lifecycle.go (87%) rename internal/{ => frontend}/cli/view_helpers.go (100%) rename internal/{ => frontend}/cli/view_helpers_test.go (97%) rename internal/{ => frontend}/cli/web_browser.go (100%) rename internal/{ => frontend}/cli/web_process_unix.go (100%) rename internal/{ => frontend}/cli/web_process_windows.go (100%) rename internal/{ => frontend}/cli/web_runtime.go (98%) rename internal/{ => frontend}/cli/web_runtime_test.go (98%) rename internal/{ => frontend}/cli/web_test.go (97%) rename internal/{ => frontend}/cli/width_test.go (100%) rename internal/{ => frontend}/doctor/billing.go (98%) rename internal/{ => frontend}/doctor/billing_test.go (94%) rename internal/{ => frontend}/doctor/git_test.go (97%) rename internal/{ => frontend}/doctor/main_test.go (76%) rename internal/{ => frontend}/doctor/quality.go (98%) rename internal/{ => frontend}/doctor/quality_test.go (98%) rename internal/{ => frontend}/doctor/reasoning_report_test.go (97%) rename internal/{ => frontend}/doctor/report.go (98%) rename internal/{ => frontend}/doctor/report_test.go (98%) rename internal/{ => frontend}/doctor/session_bundle.go (99%) rename internal/{ => frontend}/doctor/session_bundle_test.go (97%) rename internal/{ => frontend}/doctor/session_redact.go (98%) rename internal/{ => frontend}/doctor/session_redact_test.go (98%) rename internal/{ => frontend}/doctor/skill_health.go (97%) rename internal/{ => frontend}/doctor/skill_health_test.go (95%) rename internal/{ => frontend}/remotehost/remotehost.go (97%) rename internal/{ => frontend}/serve/account.go (97%) rename internal/{ => frontend}/serve/account_test.go (97%) rename internal/{ => frontend}/serve/adjudications.go (98%) rename internal/{ => frontend}/serve/adjudications_test.go (96%) rename internal/{ => frontend}/serve/appearance.go (99%) rename internal/{ => frontend}/serve/approval_persist_test.go (95%) rename internal/{ => frontend}/serve/ask.go (100%) rename internal/{ => frontend}/serve/ask_test.go (99%) rename internal/{ => frontend}/serve/attachments.go (98%) rename internal/{ => frontend}/serve/attachments_test.go (95%) rename internal/{ => frontend}/serve/auth.go (99%) rename internal/{ => frontend}/serve/auth_fragment_test.go (99%) rename internal/{ => frontend}/serve/auth_test.go (99%) rename internal/{ => frontend}/serve/balance.go (97%) rename internal/{ => frontend}/serve/balance_route_test.go (97%) rename internal/{ => frontend}/serve/boundary.go (98%) rename internal/{ => frontend}/serve/boundary_test.go (98%) rename internal/{ => frontend}/serve/broadcaster.go (98%) rename internal/{ => frontend}/serve/broadcaster_test.go (98%) rename internal/{ => frontend}/serve/browser_host.go (99%) rename internal/{ => frontend}/serve/browser_host_test.go (98%) rename internal/{ => frontend}/serve/browser_open.go (100%) rename internal/{ => frontend}/serve/browser_tabs.go (100%) rename internal/{ => frontend}/serve/browser_tabs_test.go (91%) rename internal/{ => frontend}/serve/capability_project.go (96%) rename internal/{ => frontend}/serve/capability_project_test.go (95%) rename internal/{ => frontend}/serve/capability_scope.go (97%) rename internal/{ => frontend}/serve/catalog.go (99%) rename internal/{ => frontend}/serve/catalog_refusal_test.go (97%) rename internal/{ => frontend}/serve/catalog_test.go (98%) rename internal/{ => frontend}/serve/changes.go (98%) rename internal/{ => frontend}/serve/changes_test.go (95%) rename internal/{ => frontend}/serve/compact.go (97%) rename internal/{ => frontend}/serve/compaction_settings.go (100%) rename internal/{ => frontend}/serve/complete.go (97%) rename internal/{ => frontend}/serve/complete_test.go (97%) rename internal/{ => frontend}/serve/config_file.go (100%) rename internal/{ => frontend}/serve/config_file_test.go (98%) rename internal/{ => frontend}/serve/context_window.go (99%) rename internal/{ => frontend}/serve/context_window_test.go (98%) rename internal/{ => frontend}/serve/csrf_test.go (94%) rename internal/{ => frontend}/serve/decisions_status_test.go (88%) rename internal/{ => frontend}/serve/drop.go (98%) rename internal/{ => frontend}/serve/drop_test.go (98%) rename internal/{ => frontend}/serve/editor.go (95%) rename internal/{ => frontend}/serve/editor_test.go (96%) rename internal/{ => frontend}/serve/effort_refusal_test.go (95%) rename internal/{ => frontend}/serve/effort_test.go (98%) rename internal/{ => frontend}/serve/eventstream.go (99%) rename internal/{ => frontend}/serve/eventstream_test.go (99%) rename internal/{ => frontend}/serve/executiongraph.go (98%) rename internal/{ => frontend}/serve/executiongraph_test.go (97%) rename internal/{ => frontend}/serve/extensions.go (100%) rename internal/{ => frontend}/serve/extensions_test.go (98%) rename internal/{ => frontend}/serve/fail.go (99%) rename internal/{ => frontend}/serve/frontend_contract_test.go (97%) rename internal/{ => frontend}/serve/history.go (98%) rename internal/{ => frontend}/serve/history_failure_test.go (98%) rename internal/{ => frontend}/serve/hooks.go (99%) rename internal/{ => frontend}/serve/host_authored_history_test.go (91%) rename internal/{ => frontend}/serve/hub.go (98%) rename internal/{ => frontend}/serve/hub_approval_test.go (96%) rename internal/{ => frontend}/serve/hub_balance_test.go (96%) rename internal/{ => frontend}/serve/hub_decision_audit_test.go (90%) rename internal/{ => frontend}/serve/hub_interactive_test.go (92%) rename internal/{ => frontend}/serve/hub_lease_test.go (97%) rename internal/{ => frontend}/serve/hub_open_refusal_test.go (96%) rename internal/{ => frontend}/serve/hub_picker.go (100%) rename internal/{ => frontend}/serve/hub_picker_other.go (100%) rename internal/{ => frontend}/serve/hub_picker_test.go (100%) rename internal/{ => frontend}/serve/hub_picker_windows.go (100%) rename internal/{ => frontend}/serve/hub_release.go (100%) rename internal/{ => frontend}/serve/hub_remote.go (99%) rename internal/{ => frontend}/serve/hub_remote_test.go (99%) rename internal/{ => frontend}/serve/hub_resolver_test.go (96%) rename internal/{ => frontend}/serve/hub_serve.go (100%) rename internal/{ => frontend}/serve/hub_test.go (98%) rename internal/{ => frontend}/serve/hub_tree.go (98%) rename internal/{ => frontend}/serve/hub_tree_remove_test.go (98%) rename internal/{ => frontend}/serve/inbox.go (98%) rename internal/{ => frontend}/serve/inbox_refusal_test.go (97%) rename internal/{ => frontend}/serve/inbox_test.go (93%) rename internal/{ => frontend}/serve/listen.go (100%) rename internal/{ => frontend}/serve/login.html (100%) rename internal/{ => frontend}/serve/logo-wordmark.svg (100%) rename internal/{ => frontend}/serve/loopback.go (100%) rename internal/{ => frontend}/serve/loopback_test.go (99%) rename internal/{ => frontend}/serve/main_test.go (76%) rename internal/{ => frontend}/serve/memory.go (99%) rename internal/{ => frontend}/serve/model_refs_test.go (96%) rename internal/{ => frontend}/serve/modelcaps.go (98%) rename internal/{ => frontend}/serve/modelcaps_test.go (98%) rename internal/{ => frontend}/serve/modelroutes_test.go (100%) rename internal/{ => frontend}/serve/models_catalog.go (96%) rename internal/{ => frontend}/serve/modelswitch_test.go (95%) rename internal/{ => frontend}/serve/network.go (97%) rename internal/{ => frontend}/serve/notifications.go (98%) rename internal/{ => frontend}/serve/page.go (100%) rename internal/{ => frontend}/serve/page_test.go (98%) rename internal/{ => frontend}/serve/pane_sink.go (93%) rename internal/{ => frontend}/serve/plan.go (97%) rename internal/{ => frontend}/serve/plugins.go (98%) rename internal/{ => frontend}/serve/plugins_test.go (98%) rename internal/{ => frontend}/serve/prompt_refine.go (97%) rename internal/{ => frontend}/serve/prompt_refine_test.go (93%) rename internal/{ => frontend}/serve/provider_check.go (98%) rename internal/{ => frontend}/serve/provider_check_test.go (99%) rename internal/{ => frontend}/serve/provider_continuation_test.go (98%) rename internal/{ => frontend}/serve/provider_edit.go (99%) rename internal/{ => frontend}/serve/provider_edit_test.go (99%) rename internal/{ => frontend}/serve/provider_keyreuse.go (96%) rename internal/{ => frontend}/serve/provider_keyreuse_test.go (98%) rename internal/{ => frontend}/serve/provider_setup.go (99%) rename internal/{ => frontend}/serve/provider_setup_test.go (99%) rename internal/{ => frontend}/serve/provider_thinking_test.go (98%) rename internal/{ => frontend}/serve/providers.go (99%) rename internal/{ => frontend}/serve/providers_test.go (98%) rename internal/{ => frontend}/serve/rebuild_sink_test.go (92%) rename internal/{ => frontend}/serve/rebuild_workspace_test.go (92%) rename internal/{ => frontend}/serve/recovery_fold_test.go (96%) rename internal/{ => frontend}/serve/refusal_parity_test.go (96%) rename internal/{ => frontend}/serve/refuse_common.go (100%) rename internal/{ => frontend}/serve/reload_options_test.go (93%) rename internal/{ => frontend}/serve/remote_book.go (99%) rename internal/{ => frontend}/serve/remote_book_test.go (99%) rename internal/{ => frontend}/serve/remote_browse.go (100%) rename internal/{ => frontend}/serve/remote_browse_test.go (100%) rename internal/{ => frontend}/serve/resume.go (97%) rename internal/{ => frontend}/serve/rewind.go (98%) rename internal/{ => frontend}/serve/roles.go (99%) rename internal/{ => frontend}/serve/roles_test.go (99%) rename internal/{ => frontend}/serve/route_parity_test.go (98%) rename internal/{ => frontend}/serve/routes.go (100%) rename internal/{ => frontend}/serve/serve.go (99%) rename internal/{ => frontend}/serve/serve_lease_test.go (98%) rename internal/{ => frontend}/serve/serve_lock_test.go (98%) rename internal/{ => frontend}/serve/serve_portfile_test.go (95%) rename internal/{ => frontend}/serve/serve_test.go (99%) rename internal/{ => frontend}/serve/session_files_partial_test.go (95%) rename internal/{ => frontend}/serve/session_files_test.go (89%) rename internal/{ => frontend}/serve/session_write_authority.go (97%) rename internal/{ => frontend}/serve/sessions_current_test.go (94%) rename internal/{ => frontend}/serve/sessions_recovery.go (98%) rename internal/{ => frontend}/serve/sessions_recovery_test.go (94%) rename internal/{ => frontend}/serve/sessions_sidecar_test.go (91%) rename internal/{ => frontend}/serve/sessions_visibility_test.go (96%) rename internal/{ => frontend}/serve/settings.go (98%) rename internal/{ => frontend}/serve/shell.go (100%) rename internal/{ => frontend}/serve/shell_test.go (97%) rename internal/{ => frontend}/serve/storage.go (99%) rename internal/{ => frontend}/serve/storage_test.go (98%) rename internal/{ => frontend}/serve/studio_version.go (98%) rename internal/{ => frontend}/serve/studio_version_test.go (97%) rename internal/{ => frontend}/serve/submit_authority_test.go (91%) rename internal/{ => frontend}/serve/surfaces.go (98%) rename internal/{ => frontend}/serve/surfaces_test.go (97%) rename internal/{ => frontend}/serve/switch_axes_test.go (97%) rename internal/{ => frontend}/serve/switch_recovery_test.go (98%) rename internal/{ => frontend}/serve/themes.go (98%) rename internal/{ => frontend}/serve/themes_test.go (98%) rename internal/{ => frontend}/serve/title_test.go (97%) rename internal/{ => frontend}/serve/titlecache.go (97%) rename internal/{ => frontend}/serve/titlecache_test.go (98%) rename internal/{ => frontend}/serve/titlefill.go (96%) rename internal/{ => frontend}/serve/todos.go (100%) rename internal/{ => frontend}/serve/trace_facts_test.go (99%) rename internal/{ => frontend}/serve/trace_fixture_test.go (94%) rename internal/{ => frontend}/serve/trace_parity_test.go (98%) rename internal/{ => frontend}/serve/tray.go (98%) rename internal/{ => frontend}/serve/tray_test.go (97%) rename internal/{ => frontend}/serve/turn_identity_test.go (93%) rename internal/{ => frontend}/serve/update.go (97%) rename internal/{ => frontend}/serve/update_test.go (98%) rename internal/{ => frontend}/serve/usage.go (95%) rename internal/{ => frontend}/serve/web_entry_test.go (96%) rename internal/{ => frontend}/serve/welcome.go (97%) rename internal/{ => frontend}/serve/welcome_test.go (97%) rename internal/{ => frontend}/serve/wirelog.go (98%) rename internal/{ => frontend}/serve/wirelog_coverage_test.go (96%) rename internal/{ => frontend}/serve/wirelog_test.go (98%) rename internal/{ => frontend}/serve/workgroup_semantics_test.go (98%) rename internal/{ => frontend}/serve/workspace.go (98%) rename internal/{ => frontend}/serve/workspace_files.go (100%) rename internal/{ => frontend}/serve/workspace_files_test.go (94%) rename internal/{ => frontend}/serve/workspace_test.go (96%) rename internal/{ => frontend}/traystate/traystate.go (99%) rename internal/{ => frontend}/traystate/traystate_test.go (99%) rename internal/{provider => model}/anthropic/anthropic.go (99%) rename internal/{provider => model}/anthropic/anthropic_test.go (99%) rename internal/{provider => model}/anthropic/image_test.go (99%) rename internal/{provider => model}/anthropic/output_budget.go (100%) rename internal/{provider => model}/anthropic/output_budget_test.go (100%) rename internal/{provider => model}/anthropic/realdeepseek_test.go (99%) rename internal/{provider => model}/anthropic/realyyds_test.go (98%) rename internal/{provider => model}/anthropic/reasoning.go (98%) rename internal/{provider => model}/anthropic/reasoning_replay_test.go (98%) rename internal/{provider => model}/anthropic/request_url_test.go (97%) rename internal/{provider => model}/anthropic/stall_test.go (98%) rename internal/{provider => model}/anthropic/stream_error.go (89%) rename internal/{provider => model}/anthropic/tool_execution_wire_test.go (98%) rename internal/{provider => model}/anthropic/web_search.go (98%) rename internal/{provider => model}/anthropic/web_search_test.go (99%) rename internal/{ => model}/billing/balance.go (100%) rename internal/{ => model}/billing/balance_extra_test.go (100%) rename internal/{ => model}/billing/balance_test.go (100%) rename internal/{ => model}/billing/cache.go (100%) rename internal/{ => model}/billing/cache_test.go (100%) rename internal/{ => model}/billing/catalog.go (100%) rename internal/{ => model}/billing/catalog_test.go (100%) rename internal/{ => model}/billing/coverage.go (100%) rename internal/{ => model}/billing/coverage_test.go (100%) rename internal/{ => model}/billing/ledger.go (100%) rename internal/{ => model}/billing/migrate.go (100%) rename internal/{ => model}/billing/migrate_test.go (100%) rename internal/{ => model}/billing/money.go (100%) rename internal/{ => model}/billing/money_test.go (100%) rename internal/{ => model}/billing/quote.go (100%) rename internal/{ => model}/billing/quote_test.go (100%) rename internal/{ => model}/billing/rates.go (100%) rename internal/{ => model}/billing/rates_test.go (100%) rename internal/{ => model}/billing/shape.go (100%) rename internal/{ => model}/billing/shape_test.go (100%) rename internal/{ => model}/billing/window.go (100%) rename internal/{ => model}/billing/window_test.go (100%) rename internal/{ => model}/boundedllm/bounded.go (97%) rename internal/{ => model}/laya/client.go (98%) rename internal/{provider => model}/openai/downgrade.go (98%) rename internal/{provider => model}/openai/effort.go (98%) rename internal/{provider => model}/openai/effort_declared_test.go (98%) rename internal/{provider => model}/openai/effort_override_test.go (98%) rename internal/{provider => model}/openai/effort_test.go (99%) rename internal/{provider => model}/openai/empty_stream_test.go (98%) rename internal/{provider => model}/openai/fetch_models.go (100%) rename internal/{provider => model}/openai/fetch_models_test.go (100%) rename internal/{provider => model}/openai/h2_reset_test.go (98%) rename internal/{provider => model}/openai/host.go (99%) rename internal/{provider => model}/openai/host_test.go (100%) rename internal/{provider => model}/openai/image_test.go (99%) rename internal/{provider => model}/openai/keyrotation_test.go (98%) rename internal/{provider => model}/openai/kimi_k3.go (100%) rename internal/{provider => model}/openai/kimi_k3_test.go (98%) rename internal/{provider => model}/openai/lifecycle.go (100%) rename internal/{provider => model}/openai/openai.go (99%) rename internal/{provider => model}/openai/openai_test.go (99%) rename internal/{provider => model}/openai/output_budget.go (100%) rename internal/{provider => model}/openai/output_budget_test.go (100%) rename internal/{provider => model}/openai/realcache_test.go (98%) rename internal/{provider => model}/openai/reasoning_replay.go (97%) rename internal/{provider => model}/openai/reasoning_replay_test.go (98%) rename internal/{provider => model}/openai/reconnect_test.go (99%) rename internal/{provider => model}/openai/request_url_test.go (93%) rename internal/{provider => model}/openai/stall_recover_test.go (98%) rename internal/{provider => model}/openai/stall_test.go (98%) rename internal/{provider => model}/openai/stream_error.go (100%) rename internal/{provider => model}/openai/stream_failure.go (97%) rename internal/{provider => model}/openai/stream_payload_error_test.go (98%) rename internal/{provider => model}/openai/think.go (100%) rename internal/{provider => model}/openai/think_test.go (100%) rename internal/{provider => model}/openai/tool_execution_wire_test.go (98%) rename internal/{ => model}/providerbroker/broker_test.go (99%) rename internal/{ => model}/providerbroker/client.go (99%) rename internal/{ => model}/providerbroker/doc.go (100%) rename internal/{ => model}/providerbroker/local.go (97%) rename internal/{ => model}/providerbroker/server.go (99%) rename internal/{ => model}/providerbroker/tunnel_test.go (97%) rename internal/{ => model}/providerbroker/wire.go (99%) rename internal/{provider => model}/responses/image_test.go (98%) rename internal/{provider => model}/responses/keyresolver.go (100%) rename internal/{provider => model}/responses/output_budget.go (93%) rename internal/{provider => model}/responses/output_budget_test.go (100%) rename internal/{provider => model}/responses/realdeepseek_test.go (99%) rename internal/{provider => model}/responses/request_url_test.go (97%) rename internal/{provider => model}/responses/responses.go (99%) rename internal/{provider => model}/responses/responses_test.go (99%) rename internal/{provider => model}/responses/stall_test.go (99%) rename internal/{provider => model}/responses/stream.go (99%) rename internal/{provider => model}/responses/test_hooks.go (100%) rename internal/{provider => model}/responses/tool_execution_wire_test.go (98%) rename internal/{provider => model}/responses/vendor.go (99%) rename internal/{provider => model}/responses/web_search.go (97%) rename internal/{provider => model}/responses/web_search_replay_test.go (95%) rename internal/{provider => model}/responses/wire_gap_test.go (99%) rename internal/{ => model}/visionimage/visionimage.go (100%) rename internal/{ => model}/visionimage/visionimage_test.go (100%) rename internal/{ => platform}/account/account.go (100%) rename internal/{ => platform}/account/account_test.go (100%) rename internal/{ => platform}/account/token.go (96%) rename internal/{ => platform}/appidentity/identity.go (100%) rename internal/{ => platform}/appidentity/identity_test.go (100%) rename internal/{ => platform}/appupdate/apply_other.go (94%) rename internal/{ => platform}/appupdate/apply_windows.go (93%) rename internal/{ => platform}/appupdate/appupdate.go (97%) rename internal/{ => platform}/appupdate/appupdate_test.go (97%) rename internal/{ => platform}/appupdate/catalog_test.go (100%) rename internal/{ => platform}/appupdate/install.go (99%) rename internal/{ => platform}/browser/act.go (100%) rename internal/{ => platform}/browser/browser_test.go (99%) rename internal/{ => platform}/browser/capture.go (98%) rename internal/{ => platform}/browser/cdp.go (100%) rename internal/{ => platform}/browser/credential.go (100%) rename internal/{ => platform}/browser/discover.go (100%) rename internal/{ => platform}/browser/doc.go (100%) rename internal/{ => platform}/browser/endpoint.go (100%) rename internal/{ => platform}/browser/endpoint_test.go (100%) rename internal/{ => platform}/browser/engine.go (99%) rename internal/{ => platform}/browser/eval.go (100%) rename internal/{ => platform}/browser/eval_test.go (100%) rename internal/{ => platform}/browser/failure.go (100%) rename internal/{ => platform}/browser/fake_cdp_test.go (100%) rename internal/{ => platform}/browser/keys.go (100%) rename internal/{ => platform}/browser/live_test.go (99%) rename internal/{ => platform}/browser/network.go (100%) rename internal/{ => platform}/browser/policy.go (99%) rename internal/{ => platform}/browser/refs.go (100%) rename internal/{ => platform}/browser/session.go (100%) rename internal/{ => platform}/browser/snapshot.go (100%) rename internal/{ => platform}/browser/tab.go (100%) rename internal/{ => platform}/browser/transport.go (100%) rename internal/{ => platform}/computer/doc.go (100%) rename internal/{ => platform}/computer/failure.go (100%) rename internal/{ => platform}/computer/helper.go (99%) rename internal/{ => platform}/computer/live_darwin_test.go (99%) rename internal/{ => platform}/computer/live_test.go (100%) rename internal/{ => platform}/computer/live_windows_test.go (99%) rename internal/{ => platform}/computer/session.go (99%) rename internal/{ => platform}/computer/session_test.go (99%) rename internal/{ => platform}/computer/testdata/target.swift (100%) rename internal/{ => platform}/computer/testdata/wintarget/main.go (100%) rename internal/{ => platform}/crashreport/cli.go (99%) rename internal/{ => platform}/crashreport/cli_test.go (93%) rename internal/{ => platform}/editor/editor.go (100%) rename internal/{ => platform}/editor/editor_test.go (100%) rename internal/{ => platform}/environment/probe.go (99%) rename internal/{ => platform}/environment/probe_share_test.go (99%) rename internal/{ => platform}/environment/probe_test.go (99%) rename internal/{ => platform}/environment/probe_windows_test.go (100%) rename internal/{ => platform}/environment/snapshot.go (98%) rename internal/{ => platform}/environment/snapshot_test.go (99%) rename internal/{ => platform}/environment/workspace_vcs.go (96%) rename internal/{ => platform}/environment/workspace_vcs_test.go (97%) rename internal/{ => platform}/gitcmd/gitcmd.go (98%) rename internal/{ => platform}/gitcmd/gitcmd_test.go (99%) rename internal/{ => platform}/gitstatus/gitstatus.go (99%) rename internal/{ => platform}/gitstatus/gitstatus_test.go (99%) rename internal/{ => platform}/gitstatus/numstat_test.go (100%) rename internal/{ => platform}/installlayout/activate.go (99%) rename internal/{ => platform}/installlayout/activate_test.go (99%) rename internal/{ => platform}/installlayout/current.go (99%) rename internal/{ => platform}/installlayout/current_test.go (99%) rename internal/{ => platform}/installlayout/fault_inject_test.go (99%) rename internal/{ => platform}/instanceid/instanceid.go (95%) rename internal/{ => platform}/instanceid/instanceid_test.go (100%) rename internal/{ => platform}/lsp/client.go (99%) rename internal/{ => platform}/lsp/jsonrpc.go (100%) rename internal/{ => platform}/lsp/jsonrpc_framecap_test.go (100%) rename internal/{ => platform}/lsp/lsp_test.go (99%) rename internal/{ => platform}/lsp/main_test.go (100%) rename internal/{ => platform}/lsp/manager.go (100%) rename internal/{ => platform}/lsp/manual_test.go (96%) rename internal/{ => platform}/lsp/position.go (100%) rename internal/{ => platform}/lsp/results.go (100%) rename internal/{ => platform}/lsp/testdata/lsp/bash/script.sh (100%) rename internal/{ => platform}/lsp/testdata/lsp/golang/go.mod (100%) rename internal/{ => platform}/lsp/testdata/lsp/golang/main.go (100%) rename internal/{ => platform}/lsp/testdata/lsp/python/main.py (100%) rename internal/{ => platform}/lsp/testdata/lsp/rust/.gitignore (100%) rename internal/{ => platform}/lsp/testdata/lsp/rust/Cargo.lock (100%) rename internal/{ => platform}/lsp/testdata/lsp/rust/Cargo.toml (100%) rename internal/{ => platform}/lsp/testdata/lsp/rust/src/main.rs (100%) rename internal/{ => platform}/lsp/testdata/lsp/typescript/index.ts (100%) rename internal/{ => platform}/lsp/testdata/lsp/typescript/tsconfig.json (100%) rename internal/{ => platform}/lsp/tool.go (98%) rename internal/{ => platform}/notify/sender_darwin.go (95%) rename internal/{ => platform}/notify/sender_linux.go (93%) rename internal/{ => platform}/notify/sender_other.go (100%) rename internal/{ => platform}/notify/sender_windows.go (93%) rename internal/{ => platform}/notify/settings.go (96%) rename internal/{ => platform}/notify/sink.go (95%) rename internal/{ => platform}/notify/sink_test.go (98%) rename internal/{ => platform}/packagegrant/acl.go (100%) rename internal/{ => platform}/packagegrant/acl_test.go (100%) rename internal/{ => platform}/packagegrant/doc.go (100%) rename internal/{ => platform}/packagegrant/strip_other.go (100%) rename internal/{ => platform}/packagegrant/strip_windows.go (100%) rename internal/{ => platform}/packagegrant/strip_windows_test.go (100%) rename internal/{ => platform}/releaseasset/cache.go (100%) rename internal/{ => platform}/releaseasset/cache_test.go (100%) rename internal/{ => platform}/releaseasset/cli.go (99%) rename internal/{ => platform}/releaseasset/cli_test.go (100%) rename internal/{ => platform}/remote/agent.go (100%) rename internal/{ => platform}/remote/agent_test.go (98%) rename internal/{ => platform}/remote/agent_unix.go (100%) rename internal/{ => platform}/remote/agent_windows.go (100%) rename internal/{ => platform}/remote/attach/attach.go (98%) rename internal/{ => platform}/remote/attach/attach_test.go (98%) rename internal/{ => platform}/remote/attach/browse.go (98%) rename internal/{ => platform}/remote/attach/browse_test.go (98%) rename internal/{ => platform}/remote/attach/dial.go (95%) rename internal/{ => platform}/remote/attach/probe.go (96%) rename internal/{ => platform}/remote/auth.go (100%) rename internal/{ => platform}/remote/backoff_test.go (100%) rename internal/{ => platform}/remote/bootstrap/bootstrap.go (99%) rename internal/{ => platform}/remote/bootstrap/bootstrap_pure_test.go (99%) rename internal/{ => platform}/remote/bootstrap/ensure_test.go (99%) rename internal/{ => platform}/remote/bootstrap/errors.go (100%) rename internal/{ => platform}/remote/bootstrap/fetch.go (98%) rename internal/{ => platform}/remote/bootstrap/fetch_live_test.go (98%) rename internal/{ => platform}/remote/bootstrap/fetch_test.go (99%) rename internal/{ => platform}/remote/bootstrap/hardening_test.go (98%) rename internal/{ => platform}/remote/bootstrap/install.go (99%) rename internal/{ => platform}/remote/bootstrap/launch.go (100%) rename internal/{ => platform}/remote/bootstrap/lock.go (98%) rename internal/{ => platform}/remote/bootstrap/platform.go (100%) rename internal/{ => platform}/remote/bootstrap/posixshell.go (95%) rename internal/{ => platform}/remote/bootstrap/probe.go (99%) rename internal/{ => platform}/remote/bootstrap/probe_test.go (98%) rename internal/{ => platform}/remote/bootstrap/remoteos.go (97%) rename internal/{ => platform}/remote/bootstrap/state.go (98%) rename internal/{ => platform}/remote/bootstrap/state_test.go (100%) rename internal/{ => platform}/remote/bootstrap/windowsshell.go (98%) rename internal/{ => platform}/remote/bootstrap/windowsshell_test.go (100%) rename internal/{ => platform}/remote/client.go (98%) rename internal/{ => platform}/remote/client_agent_unix_test.go (97%) rename internal/{ => platform}/remote/client_test.go (99%) rename internal/{ => platform}/remote/dial.go (99%) rename internal/{ => platform}/remote/dial_hardening_test.go (99%) rename internal/{ => platform}/remote/dial_test.go (100%) rename internal/{ => platform}/remote/forward/addrinuse.go (100%) rename internal/{ => platform}/remote/forward/addrinuse_windows.go (100%) rename internal/{ => platform}/remote/forward/forward.go (100%) rename internal/{ => platform}/remote/forward/forward_test.go (100%) rename internal/{ => platform}/remote/forward/set.go (100%) rename internal/{ => platform}/remote/forward/set_test.go (99%) rename internal/{ => platform}/remote/host.go (99%) rename internal/{ => platform}/remote/host_test.go (98%) rename internal/{ => platform}/remote/jump_resolve_test.go (96%) rename internal/{ => platform}/remote/knownhosts.go (100%) rename internal/{ => platform}/remote/knownhosts_error_test.go (100%) rename internal/{ => platform}/remote/knownhosts_test.go (99%) rename internal/{ => platform}/remote/paths.go (87%) rename internal/{ => platform}/remote/reconnect_test.go (99%) rename internal/{ => platform}/remote/remote.go (98%) rename internal/{ => platform}/remote/sftpfs/detect.go (100%) rename internal/{ => platform}/remote/sftpfs/detect_test.go (100%) rename internal/{ => platform}/remote/sftpfs/sftpfs.go (100%) rename internal/{ => platform}/remote/sftpfs/sftpfs_test.go (98%) rename internal/{ => platform}/remote/sshconfig.go (100%) rename internal/{ => platform}/remote/sshconfig_test.go (99%) rename internal/{ => platform}/remote/sshtest/keys.go (100%) rename internal/{ => platform}/remote/sshtest/sshtest.go (100%) rename internal/{ => platform}/remote/status.go (100%) rename internal/{ => platform}/repair/apply_failure.go (99%) rename internal/{ => platform}/repair/config.go (99%) rename internal/{ => platform}/repair/config_test.go (99%) rename internal/{ => platform}/repair/derived.go (99%) rename internal/{ => platform}/repair/diagnose.go (99%) rename internal/{ => platform}/repair/diagnose_test.go (98%) rename internal/{ => platform}/repair/main_test.go (76%) rename internal/{ => platform}/repair/mutation_lock.go (99%) rename internal/{ => platform}/repair/open_regular_other.go (100%) rename internal/{ => platform}/repair/open_regular_unix.go (100%) rename internal/{ => platform}/repair/open_regular_windows.go (100%) rename internal/{ => platform}/repair/path_case_darwin.go (100%) rename internal/{ => platform}/repair/path_case_darwin_test.go (97%) rename internal/{ => platform}/repair/path_case_other.go (100%) rename internal/{ => platform}/repair/path_case_platform.go (100%) rename internal/{ => platform}/repair/path_case_windows.go (100%) rename internal/{ => platform}/repair/path_unicode_other.go (100%) rename internal/{ => platform}/repair/plan.go (99%) rename internal/{ => platform}/repair/plan_test.go (99%) rename internal/{ => platform}/repair/process_other.go (100%) rename internal/{ => platform}/repair/process_unix.go (100%) rename internal/{ => platform}/repair/process_windows.go (100%) rename internal/{ => platform}/repair/provenance_test.go (98%) rename internal/{ => platform}/repair/rename_noreplace_darwin.go (100%) rename internal/{ => platform}/repair/rename_noreplace_linux.go (100%) rename internal/{ => platform}/repair/rename_noreplace_other.go (100%) rename internal/{ => platform}/repair/rename_noreplace_windows.go (100%) rename internal/{ => platform}/repair/rename_noreplace_windows_test.go (96%) rename internal/{ => platform}/repair/snapshot.go (99%) rename internal/{ => platform}/repair/startup.go (98%) rename internal/{ => platform}/repair/startup_test.go (98%) rename internal/{ => platform}/repair/startup_windows_test.go (95%) rename internal/{ => platform}/repair/transaction.go (99%) rename internal/{ => platform}/repair/transaction_test.go (99%) rename internal/{ => platform}/repair/update.go (99%) rename internal/{ => platform}/repair/update_debris_test.go (99%) rename internal/{ => platform}/repair/update_file_claim_test.go (99%) rename internal/{ => platform}/repair/update_handoff_commit_test.go (100%) rename internal/{ => platform}/repair/update_handoff_darwin_smoke_test.go (96%) rename internal/{ => platform}/repair/update_handoff_test.go (99%) rename internal/{ => platform}/repair/update_health.go (100%) rename internal/{ => platform}/repair/update_legacy.go (99%) rename internal/{ => platform}/repair/update_legacy_test.go (99%) rename internal/{ => platform}/repair/update_lock_test.go (99%) rename internal/{ => platform}/repair/update_security_test.go (99%) rename internal/{ => platform}/repair/update_test.go (99%) rename internal/{ => platform}/repair/update_test_helpers_test.go (100%) rename internal/{ => platform}/telemetry/client.go (98%) rename internal/{ => platform}/telemetry/client_test.go (98%) rename internal/{ => platform}/telemetry/lease_test.go (98%) rename internal/{ => platform}/telemetry/payload.go (100%) rename internal/{ => platform}/telemetry/pending.go (100%) rename internal/{ => platform}/telemetry/policy.go (100%) rename internal/{ => platform}/telemetry/policy_test.go (100%) rename internal/{ => platform}/telemetry/sink.go (98%) rename internal/{ => platform}/telemetry/sink_test.go (98%) rename internal/{ => platform}/update/application_darwin.go (100%) rename internal/{ => platform}/update/apply.go (100%) rename internal/{ => platform}/update/apply_darwin.go (99%) rename internal/{ => platform}/update/apply_darwin_stub.go (100%) rename internal/{ => platform}/update/apply_darwin_test.go (99%) rename internal/{ => platform}/update/apply_linux.go (97%) rename internal/{ => platform}/update/apply_linux_test.go (98%) rename internal/{ => platform}/update/apply_other.go (100%) rename internal/{ => platform}/update/apply_windows.go (100%) rename internal/{ => platform}/update/cache.go (98%) rename internal/{ => platform}/update/cache_test.go (99%) rename internal/{ => platform}/update/catalog_test.go (100%) rename internal/{ => platform}/update/contentrange.go (100%) rename internal/{ => platform}/update/contentrange_test.go (100%) rename internal/{ => platform}/update/deb.go (100%) rename internal/{ => platform}/update/deb_linux.go (100%) rename internal/{ => platform}/update/deb_other.go (100%) rename internal/{ => platform}/update/deb_test.go (100%) rename internal/{ => platform}/update/download.go (100%) rename internal/{ => platform}/update/download_test.go (99%) rename internal/{ => platform}/update/handoff_contract_test.go (92%) rename internal/{ => platform}/update/hub.go (98%) rename internal/{ => platform}/update/hub_catalog_test.go (100%) rename internal/{ => platform}/update/hub_test.go (100%) rename internal/{ => platform}/update/index.go (100%) rename internal/{ => platform}/update/index_test.go (100%) rename internal/{ => platform}/update/install.go (100%) rename internal/{ => platform}/update/install_args.go (100%) rename internal/{ => platform}/update/install_args_test.go (97%) rename internal/{ => platform}/update/install_other.go (93%) rename internal/{ => platform}/update/install_windows.go (99%) rename internal/{ => platform}/update/install_windows_test.go (98%) rename internal/{ => platform}/update/installer_run_other.go (100%) rename internal/{ => platform}/update/installer_run_windows.go (100%) rename internal/{ => platform}/update/installer_run_windows_test.go (98%) rename internal/{ => platform}/update/layout.go (98%) rename internal/{ => platform}/update/line.go (100%) rename internal/{ => platform}/update/manifest.go (100%) rename internal/{ => platform}/update/pin.go (100%) rename internal/{ => platform}/update/pin_test.go (100%) rename internal/{ => platform}/update/progress.go (100%) rename internal/{ => platform}/update/redirect_test.go (95%) rename internal/{ => platform}/update/release_unit.go (100%) rename internal/{ => platform}/update/release_unit_test.go (100%) rename internal/{ => platform}/update/studio_line.go (100%) rename internal/{ => platform}/update/transport.go (100%) rename internal/{ => platform}/update/transport_test.go (100%) rename internal/{ => platform}/update/update_test.go (100%) rename internal/{ => platform}/update/updater.go (99%) rename internal/{ => platform}/update/updater_test.go (100%) rename internal/{ => platform}/update/verify.go (100%) rename internal/{ => platform}/update/windows_payload.go (100%) rename internal/{ => platform}/update/windows_payload_test.go (100%) rename internal/{ => platform}/worktree/worktree.go (99%) rename internal/{ => platform}/worktree/worktree_test.go (98%) rename internal/{ => platform}/worktree/worktree_windows_test.go (98%) rename internal/{ => runtime}/agent/ablation_test.go (95%) rename internal/{ => runtime}/agent/agent.go (99%) rename internal/{ => runtime}/agent/agent_config.go (100%) rename internal/{ => runtime}/agent/agent_config_test.go (100%) rename internal/{ => runtime}/agent/agent_options.go (95%) rename internal/{ => runtime}/agent/agent_role.go (100%) rename internal/{ => runtime}/agent/argserror_test.go (94%) rename internal/{ => runtime}/agent/ask.go (99%) rename internal/{ => runtime}/agent/ask_delegated_test.go (95%) rename internal/{ => runtime}/agent/ask_test.go (98%) rename internal/{ => runtime}/agent/authored_turn.go (98%) rename internal/{ => runtime}/agent/authored_turn_test.go (98%) rename internal/{ => runtime}/agent/await_user.go (99%) rename internal/{ => runtime}/agent/await_user_test.go (99%) rename internal/{ => runtime}/agent/baseline_criteria.go (98%) rename internal/{ => runtime}/agent/baseline_criteria_test.go (99%) rename internal/{ => runtime}/agent/baseline_evaluate.go (98%) rename internal/{ => runtime}/agent/baseline_evaluate_test.go (98%) rename internal/{ => runtime}/agent/batch_meta_skip_test.go (88%) rename internal/{ => runtime}/agent/blocked_outcome.go (96%) rename internal/{ => runtime}/agent/blocked_tool_e2e_test.go (91%) rename internal/{ => runtime}/agent/branch.go (99%) rename internal/{ => runtime}/agent/branch_sanitize_test.go (97%) rename internal/{ => runtime}/agent/branch_test.go (99%) rename internal/{ => runtime}/agent/cache_body_test.go (99%) rename internal/{ => runtime}/agent/cache_diagnostics_test.go (97%) rename internal/{ => runtime}/agent/cache_shape.go (97%) rename internal/{ => runtime}/agent/cache_shape_test.go (98%) rename internal/{ => runtime}/agent/cachehit_e2e_test.go (99%) rename internal/{ => runtime}/agent/call_contract.go (100%) rename internal/{ => runtime}/agent/call_contract_test.go (98%) rename internal/{ => runtime}/agent/cancel_test.go (99%) rename internal/{ => runtime}/agent/canonical_path_test.go (98%) rename internal/{ => runtime}/agent/canonical_todo_test.go (99%) rename internal/{ => runtime}/agent/capability_alias_test.go (98%) rename internal/{ => runtime}/agent/capability_arguments_test.go (97%) rename internal/{ => runtime}/agent/capability_discovery_test.go (100%) rename internal/{ => runtime}/agent/capability_gate.go (98%) rename internal/{ => runtime}/agent/capability_gate_test.go (85%) rename internal/{ => runtime}/agent/capability_lead.go (96%) rename internal/{ => runtime}/agent/capability_lead_test.go (100%) rename internal/{ => runtime}/agent/capability_listing.go (98%) rename internal/{ => runtime}/agent/checkpoint_rejected.go (100%) rename internal/{ => runtime}/agent/checkpoint_rejected_test.go (100%) rename internal/{ => runtime}/agent/child_sink_capabilities_test.go (96%) rename internal/{ => runtime}/agent/command_class.go (98%) rename internal/{ => runtime}/agent/command_class_test.go (100%) rename internal/{ => runtime}/agent/commit_covered_test.go (97%) rename internal/{ => runtime}/agent/compact.go (99%) rename internal/{ => runtime}/agent/compact_ablation_test.go (96%) rename internal/{ => runtime}/agent/compact_accounting.go (98%) rename internal/{ => runtime}/agent/compact_accounting_test.go (98%) rename internal/{ => runtime}/agent/compact_announce_test.go (92%) rename internal/{ => runtime}/agent/compact_backstop_test.go (97%) rename internal/{ => runtime}/agent/compact_commit.go (99%) rename internal/{ => runtime}/agent/compact_commit_emit_test.go (98%) rename internal/{ => runtime}/agent/compact_coverage.go (98%) rename internal/{ => runtime}/agent/compact_coverage_test.go (97%) rename internal/{ => runtime}/agent/compact_fold_input.go (99%) rename internal/{ => runtime}/agent/compact_fold_input_test.go (98%) rename internal/{ => runtime}/agent/compact_incremental_test.go (96%) rename internal/{ => runtime}/agent/compact_index.go (98%) rename internal/{ => runtime}/agent/compact_index_test.go (98%) rename internal/{ => runtime}/agent/compact_longhorizon_test.go (99%) rename internal/{ => runtime}/agent/compact_loop_e2e_test.go (99%) rename internal/{ => runtime}/agent/compact_manual_scope_test.go (97%) rename internal/{ => runtime}/agent/compact_manual_verdict_test.go (93%) rename internal/{ => runtime}/agent/compact_partition_test.go (99%) rename internal/{ => runtime}/agent/compact_plan_bench_test.go (100%) rename internal/{ => runtime}/agent/compact_plan_test.go (99%) rename internal/{ => runtime}/agent/compact_projection.go (99%) rename internal/{ => runtime}/agent/compact_raw_output_test.go (99%) rename internal/{ => runtime}/agent/compact_recall.go (97%) rename internal/{ => runtime}/agent/compact_recall_test.go (96%) rename internal/{ => runtime}/agent/compact_repair_test.go (99%) rename internal/{ => runtime}/agent/compact_retry_test.go (95%) rename internal/{ => runtime}/agent/compact_search.go (98%) rename internal/{ => runtime}/agent/compact_search_test.go (99%) rename internal/{ => runtime}/agent/compact_summary_failure_test.go (98%) rename internal/{ => runtime}/agent/compact_tail_trigger_test.go (95%) rename internal/{ => runtime}/agent/compact_test.go (99%) rename internal/{ => runtime}/agent/compact_threshold_test.go (100%) rename internal/{ => runtime}/agent/compact_user_turns.go (97%) rename internal/{ => runtime}/agent/compact_user_turns_test.go (97%) rename internal/{ => runtime}/agent/compaction_budgets_test.go (97%) rename internal/{ => runtime}/agent/complete_step_e2e_test.go (98%) rename internal/{ => runtime}/agent/complete_subtask.go (98%) rename internal/{ => runtime}/agent/complete_subtask_test.go (95%) rename internal/{ => runtime}/agent/completion_receipt_test.go (95%) rename internal/{ => runtime}/agent/completion_shadow.go (95%) rename internal/{ => runtime}/agent/completion_shadow_test.go (97%) rename internal/{ => runtime}/agent/compress_tool_test.go (99%) rename internal/{ => runtime}/agent/conclude_blocked.go (99%) rename internal/{ => runtime}/agent/conclude_blocked_test.go (98%) rename internal/{ => runtime}/agent/conclude_no_changes.go (98%) rename internal/{ => runtime}/agent/context_breakdown.go (98%) rename internal/{ => runtime}/agent/context_breakdown_test.go (98%) rename internal/{ => runtime}/agent/context_budget.go (99%) rename internal/{ => runtime}/agent/context_budget_test.go (98%) rename internal/{ => runtime}/agent/context_capsule.go (100%) rename internal/{ => runtime}/agent/context_capsule_test.go (99%) rename internal/{ => runtime}/agent/context_editing_test.go (92%) rename internal/{ => runtime}/agent/context_generation.go (100%) rename internal/{ => runtime}/agent/context_maintenance_issue7935_test.go (95%) rename internal/{ => runtime}/agent/context_maintenance_restart_test.go (97%) rename internal/{ => runtime}/agent/context_manager.go (99%) rename internal/{ => runtime}/agent/context_manager_test.go (96%) rename internal/{ => runtime}/agent/context_overflow.go (98%) rename internal/{ => runtime}/agent/context_overflow_test.go (96%) rename internal/{ => runtime}/agent/context_receipt.go (99%) rename internal/{ => runtime}/agent/context_report.go (98%) rename internal/{ => runtime}/agent/context_report_test.go (94%) rename internal/{ => runtime}/agent/context_status.go (98%) rename internal/{ => runtime}/agent/context_usage.go (97%) rename internal/{ => runtime}/agent/context_usage_test.go (97%) rename internal/{ => runtime}/agent/contextual_reason_test.go (93%) rename internal/{ => runtime}/agent/contextual_tool_test.go (97%) rename internal/{ => runtime}/agent/contract_shadow.go (97%) rename internal/{ => runtime}/agent/contract_shadow_test.go (98%) rename internal/{ => runtime}/agent/coordinator.go (99%) rename internal/{ => runtime}/agent/coordinator_rollback.go (95%) rename internal/{ => runtime}/agent/coordinator_test.go (99%) rename internal/{ => runtime}/agent/criteria_receipt_test.go (95%) rename internal/{ => runtime}/agent/criterion_proof_test.go (97%) rename internal/{ => runtime}/agent/declared_check_test.go (99%) rename internal/{ => runtime}/agent/delegated_agent.go (87%) rename internal/{ => runtime}/agent/delegation_capability.go (97%) rename internal/{ => runtime}/agent/delegation_capability_test.go (98%) rename internal/{ => runtime}/agent/delegation_lifecycle.go (99%) rename internal/{ => runtime}/agent/delegation_lifecycle_test.go (98%) rename internal/{ => runtime}/agent/delegation_origin_test.go (93%) rename internal/{ => runtime}/agent/delegation_proxy_test.go (87%) rename internal/{ => runtime}/agent/delivery_hardening_test.go (99%) rename internal/{ => runtime}/agent/delivery_scope.go (100%) rename internal/{ => runtime}/agent/delivery_scope_test.go (97%) rename internal/{ => runtime}/agent/delivery_visible_final_test.go (98%) rename internal/{ => runtime}/agent/dependency_barrier_test.go (98%) rename internal/{ => runtime}/agent/dependent_writer_preview_test.go (96%) rename internal/{ => runtime}/agent/dispatch_test.go (93%) rename internal/{ => runtime}/agent/economic_trigger_test.go (98%) rename internal/{ => runtime}/agent/empty_final_test.go (98%) rename internal/{ => runtime}/agent/empty_session_gc.go (97%) rename internal/{ => runtime}/agent/empty_session_gc_test.go (98%) rename internal/{ => runtime}/agent/errors.go (100%) rename internal/{ => runtime}/agent/errors_test.go (100%) rename internal/{ => runtime}/agent/estimation_surface_test.go (96%) rename internal/{ => runtime}/agent/evidence_flow_test.go (99%) rename internal/{ => runtime}/agent/execute_batch.go (99%) rename internal/{ => runtime}/agent/execute_one.go (99%) rename internal/{ => runtime}/agent/execution_identity.go (100%) rename internal/{ => runtime}/agent/execution_identity_test.go (100%) rename internal/{ => runtime}/agent/execution_record.go (98%) rename internal/{ => runtime}/agent/execution_record_test.go (99%) rename internal/{ => runtime}/agent/extensions.go (98%) rename internal/{ => runtime}/agent/extensions_test.go (99%) rename internal/{ => runtime}/agent/failure_diagnosis.go (98%) rename internal/{ => runtime}/agent/failure_diagnosis_test.go (98%) rename internal/{ => runtime}/agent/failure_snip.go (99%) rename internal/{ => runtime}/agent/failure_snip_langs_test.go (100%) rename internal/{ => runtime}/agent/failure_snip_test.go (98%) rename internal/{ => runtime}/agent/failure_survives_folds_test.go (95%) rename internal/{ => runtime}/agent/final_readiness.go (99%) rename internal/{ => runtime}/agent/final_readiness_test.go (98%) rename internal/{ => runtime}/agent/final_rejection_test.go (96%) rename internal/{ => runtime}/agent/finalization.go (97%) rename internal/{ => runtime}/agent/fleet.go (99%) rename internal/{ => runtime}/agent/fleet_adopt.go (100%) rename internal/{ => runtime}/agent/fleet_adopt_test.go (98%) rename internal/{ => runtime}/agent/fleet_failure.go (98%) rename internal/{ => runtime}/agent/fleet_failure_test.go (98%) rename internal/{ => runtime}/agent/fleet_graph.go (99%) rename internal/{ => runtime}/agent/fleet_graph_test.go (97%) rename internal/{ => runtime}/agent/fleet_test.go (98%) rename internal/{ => runtime}/agent/fold_boundary.go (100%) rename internal/{ => runtime}/agent/fold_boundary_test.go (100%) rename internal/{ => runtime}/agent/format.go (97%) rename internal/{ => runtime}/agent/format_test.go (100%) rename internal/{ => runtime}/agent/gate_test.go (95%) rename internal/{ => runtime}/agent/goal_boundaries_test.go (90%) rename internal/{ => runtime}/agent/goal_display.go (100%) rename internal/{ => runtime}/agent/goal_display_test.go (100%) rename internal/{ => runtime}/agent/goal_recorder_isolation_test.go (97%) rename internal/{ => runtime}/agent/goal_run_boundary.go (97%) rename internal/{ => runtime}/agent/graph_lone.go (96%) rename internal/{ => runtime}/agent/graph_lone_test.go (95%) rename internal/{ => runtime}/agent/graph_publish.go (99%) rename internal/{ => runtime}/agent/graph_publish_test.go (99%) rename internal/{ => runtime}/agent/guards_test.go (99%) rename internal/{ => runtime}/agent/hooks_test.go (97%) rename internal/{ => runtime}/agent/host_context.go (96%) rename internal/{ => runtime}/agent/host_context_test.go (87%) rename internal/{ => runtime}/agent/host_stream_track.go (93%) rename internal/{ => runtime}/agent/host_stream_track_test.go (95%) rename internal/{ => runtime}/agent/interrupted_recovery.go (99%) rename internal/{ => runtime}/agent/keep_failure_test.go (97%) rename internal/{ => runtime}/agent/kept_projection.go (99%) rename internal/{ => runtime}/agent/kept_projection_test.go (99%) rename internal/{ => runtime}/agent/lineage_key_test.go (96%) rename internal/{ => runtime}/agent/listsessions_bench_test.go (95%) rename internal/{ => runtime}/agent/listsessions_sidecar_test.go (99%) rename internal/{ => runtime}/agent/live_contract_test.go (86%) rename internal/{ => runtime}/agent/live_deepseek_recovery_test.go (98%) rename internal/{ => runtime}/agent/live_goal_boundary_test.go (98%) rename internal/{ => runtime}/agent/loop_e2e_test.go (99%) rename internal/{ => runtime}/agent/main_test.go (100%) rename internal/{ => runtime}/agent/mcp_concurrency.go (98%) rename internal/{ => runtime}/agent/mcp_concurrency_test.go (99%) rename internal/{ => runtime}/agent/mcp_lifetime_test.go (95%) rename internal/{ => runtime}/agent/mcp_shared_state.go (97%) rename internal/{ => runtime}/agent/migrate.go (99%) rename internal/{ => runtime}/agent/migrate_native.go (98%) rename internal/{ => runtime}/agent/migrate_native_test.go (95%) rename internal/{ => runtime}/agent/migrate_test.go (99%) rename internal/{ => runtime}/agent/missing_reasoning_watch.go (98%) rename internal/{ => runtime}/agent/missing_reasoning_watch_test.go (88%) rename internal/{ => runtime}/agent/nested_sink.go (98%) rename internal/{ => runtime}/agent/nested_sink_double_test.go (97%) rename internal/{ => runtime}/agent/nil_boundary_test.go (96%) rename internal/{ => runtime}/agent/noop_reachability_test.go (97%) rename internal/{ => runtime}/agent/normalize.go (96%) rename internal/{ => runtime}/agent/obligation_notice.go (97%) rename internal/{ => runtime}/agent/ondemandconnect.go (98%) rename internal/{ => runtime}/agent/orphan_outputs.go (98%) rename internal/{ => runtime}/agent/orphan_outputs_test.go (96%) rename internal/{ => runtime}/agent/outcome_shadow.go (97%) rename internal/{ => runtime}/agent/outcome_shadow_test.go (97%) rename internal/{ => runtime}/agent/outcome_test.go (97%) rename internal/{ => runtime}/agent/output_budget.go (99%) rename internal/{ => runtime}/agent/output_budget_test.go (99%) rename internal/{ => runtime}/agent/parallel_tasks.go (99%) rename internal/{ => runtime}/agent/parallel_tasks_test.go (99%) rename internal/{ => runtime}/agent/path_bound_tools.go (98%) rename internal/{ => runtime}/agent/path_bound_tools_test.go (98%) rename internal/{ => runtime}/agent/path_effect.go (98%) rename internal/{ => runtime}/agent/path_effect_scan_test.go (99%) rename internal/{ => runtime}/agent/path_effect_test.go (99%) rename internal/{ => runtime}/agent/permission_projection_test.go (93%) rename internal/{ => runtime}/agent/plan_contract.go (97%) rename internal/{ => runtime}/agent/plan_contract_test.go (91%) rename internal/{ => runtime}/agent/plan_submission.go (98%) rename internal/{ => runtime}/agent/plan_transition_diff.go (96%) rename internal/{ => runtime}/agent/plan_transition_diff_test.go (98%) rename internal/{ => runtime}/agent/planmode_gate.go (98%) rename internal/{ => runtime}/agent/planmode_test.go (99%) rename internal/{ => runtime}/agent/planner_registry.go (97%) rename internal/{ => runtime}/agent/planner_route.go (100%) rename internal/{ => runtime}/agent/planner_submit_e2e_test.go (95%) rename internal/{ => runtime}/agent/positional_compression_test.go (98%) rename internal/{ => runtime}/agent/postllmcall_flow_test.go (98%) rename internal/{ => runtime}/agent/preflight.go (99%) rename internal/{ => runtime}/agent/preview.go (98%) rename internal/{ => runtime}/agent/preview_prose_test.go (100%) rename internal/{ => runtime}/agent/preview_test.go (99%) rename internal/{ => runtime}/agent/producer_sink.go (96%) rename internal/{ => runtime}/agent/profile_boundary_test.go (99%) rename internal/{ => runtime}/agent/profile_spec.go (98%) rename internal/{ => runtime}/agent/profile_spec_test.go (99%) rename internal/{ => runtime}/agent/project_check_probe.go (98%) rename internal/{ => runtime}/agent/project_check_probe_test.go (96%) rename internal/{ => runtime}/agent/projection.go (99%) rename internal/{ => runtime}/agent/projection_authority_test.go (98%) rename internal/{ => runtime}/agent/projection_fastpath_test.go (99%) rename internal/{ => runtime}/agent/projection_fingerprint.go (98%) rename internal/{ => runtime}/agent/projection_fingerprint_test.go (100%) rename internal/{ => runtime}/agent/projection_test.go (99%) rename internal/{ => runtime}/agent/projection_valid_test.go (98%) rename internal/{ => runtime}/agent/provider_tool.go (96%) rename internal/{ => runtime}/agent/provider_tool_test.go (97%) rename internal/{ => runtime}/agent/prune.go (97%) rename internal/{ => runtime}/agent/prune_test.go (94%) rename internal/{ => runtime}/agent/readiness_proof_test.go (98%) rename internal/{ => runtime}/agent/readiness_salvage.go (98%) rename internal/{ => runtime}/agent/readonly_bash.go (97%) rename internal/{ => runtime}/agent/readonly_bash_block_test.go (100%) rename internal/{ => runtime}/agent/readonly_handoff_test.go (98%) rename internal/{ => runtime}/agent/readonly_subagent.go (98%) rename internal/{ => runtime}/agent/reasoning_language.go (100%) rename internal/{ => runtime}/agent/reasoning_language_test.go (96%) rename internal/{ => runtime}/agent/reasoning_warn_state.go (99%) rename internal/{ => runtime}/agent/reasoning_warn_state_test.go (99%) rename internal/{ => runtime}/agent/recovery_attribution_test.go (97%) rename internal/{ => runtime}/agent/recovery_gate.go (99%) rename internal/{ => runtime}/agent/recovery_gate_test.go (97%) rename internal/{ => runtime}/agent/recovery_gc.go (99%) rename internal/{ => runtime}/agent/recovery_gc_test.go (99%) rename internal/{ => runtime}/agent/recovery_isolated.go (99%) rename internal/{ => runtime}/agent/recovery_isolated_test.go (98%) rename internal/{ => runtime}/agent/recovery_lineage.go (100%) rename internal/{ => runtime}/agent/recovery_lineage_test.go (98%) rename internal/{ => runtime}/agent/refusal_identity_live_test.go (99%) rename internal/{ => runtime}/agent/refusal_identity_test.go (99%) rename internal/{ => runtime}/agent/render_readiness_test.go (96%) rename internal/{ => runtime}/agent/response_boundary.go (99%) rename internal/{ => runtime}/agent/response_boundary_test.go (98%) rename internal/{ => runtime}/agent/retry_e2e_test.go (97%) rename internal/{ => runtime}/agent/revalidate_projection_test.go (95%) rename internal/{ => runtime}/agent/review_authority_test.go (95%) rename internal/{ => runtime}/agent/review_grant_testutil_test.go (95%) rename internal/{ => runtime}/agent/review_report.go (99%) rename internal/{ => runtime}/agent/review_unavailable.go (100%) rename internal/{ => runtime}/agent/review_unavailable_test.go (93%) rename internal/{ => runtime}/agent/run_budget.go (98%) rename internal/{ => runtime}/agent/run_budget_test.go (98%) rename internal/{ => runtime}/agent/run_loop.go (99%) rename internal/{ => runtime}/agent/run_usage.go (99%) rename internal/{ => runtime}/agent/runaway_outcome_test.go (90%) rename internal/{ => runtime}/agent/runaway_repro_test.go (100%) rename internal/{ => runtime}/agent/sampling_request.go (98%) rename internal/{ => runtime}/agent/save.go (99%) rename internal/{ => runtime}/agent/save_bench_test.go (96%) rename internal/{ => runtime}/agent/save_conflict.go (98%) rename internal/{ => runtime}/agent/save_external_write_test.go (98%) rename internal/{ => runtime}/agent/save_false_diverged_test.go (99%) rename internal/{ => runtime}/agent/save_listing_projection.go (95%) rename internal/{ => runtime}/agent/save_recovery_fanout_test.go (98%) rename internal/{ => runtime}/agent/save_recovery_helpers.go (99%) rename internal/{ => runtime}/agent/save_recovery_projection_test.go (97%) rename internal/{ => runtime}/agent/save_repair_baseline_test.go (97%) rename internal/{ => runtime}/agent/save_supersede.go (98%) rename internal/{ => runtime}/agent/save_test.go (99%) rename internal/{ => runtime}/agent/scaling_bench_test.go (97%) rename internal/{ => runtime}/agent/scheduler.go (99%) rename internal/{ => runtime}/agent/scheduler_test.go (98%) rename internal/{ => runtime}/agent/scope_escape_test.go (88%) rename internal/{ => runtime}/agent/secret_redaction_test.go (93%) rename internal/{ => runtime}/agent/services.go (93%) rename internal/{ => runtime}/agent/session.go (99%) rename internal/{ => runtime}/agent/session_checkpoint_agreement.go (98%) rename internal/{ => runtime}/agent/session_checkpoint_lineage_test.go (96%) rename internal/{ => runtime}/agent/session_compat_legacy_test.go (98%) rename internal/{ => runtime}/agent/session_concurrency_test.go (97%) rename internal/{ => runtime}/agent/session_content.go (98%) rename internal/{ => runtime}/agent/session_display_index.go (98%) rename internal/{ => runtime}/agent/session_display_index_test.go (99%) rename internal/{ => runtime}/agent/session_display_range.go (95%) rename internal/{ => runtime}/agent/session_display_read_model.go (98%) rename internal/{ => runtime}/agent/session_durability_test.go (99%) rename internal/{ => runtime}/agent/session_events.go (99%) rename internal/{ => runtime}/agent/session_events_test.go (99%) rename internal/{ => runtime}/agent/session_lease.go (99%) rename internal/{ => runtime}/agent/session_lease_probe_test.go (96%) rename internal/{ => runtime}/agent/session_lease_test.go (99%) rename internal/{ => runtime}/agent/session_listing_helpers.go (100%) rename internal/{ => runtime}/agent/session_listing_race_test.go (97%) rename internal/{ => runtime}/agent/session_lock_unix.go (98%) rename internal/{ => runtime}/agent/session_lock_windows.go (99%) rename internal/{ => runtime}/agent/session_lock_windows_test.go (98%) rename internal/{ => runtime}/agent/session_meta_ledger_test.go (99%) rename internal/{ => runtime}/agent/session_persist_observer.go (98%) rename internal/{ => runtime}/agent/session_removal.go (99%) rename internal/{ => runtime}/agent/session_removal_test.go (98%) rename internal/{ => runtime}/agent/session_temp_subagent_test.go (97%) rename internal/{ => runtime}/agent/session_test.go (99%) rename internal/{ => runtime}/agent/session_torn_log_recovery_test.go (98%) rename internal/{ => runtime}/agent/session_write_authority.go (100%) rename internal/{ => runtime}/agent/session_write_authority_test.go (98%) rename internal/{ => runtime}/agent/sessionpreview.go (98%) rename internal/{ => runtime}/agent/sessionstate.go (98%) rename internal/{ => runtime}/agent/sessionstate_test.go (100%) rename internal/{ => runtime}/agent/shell_contract_test.go (99%) rename internal/{ => runtime}/agent/shell_shape_gates.go (99%) rename internal/{ => runtime}/agent/shell_verification.go (95%) rename internal/{ => runtime}/agent/shown_paths.go (98%) rename internal/{ => runtime}/agent/shown_paths_test.go (97%) rename internal/{ => runtime}/agent/silent_exit.go (98%) rename internal/{ => runtime}/agent/silent_exit_test.go (86%) rename internal/{ => runtime}/agent/slot.go (100%) rename internal/{ => runtime}/agent/spawn_boundary_test.go (86%) rename internal/{ => runtime}/agent/stale_anchor_guard_test.go (98%) rename internal/{ => runtime}/agent/steer_flush_test.go (97%) rename internal/{ => runtime}/agent/steer_inbox.go (99%) rename internal/{ => runtime}/agent/steer_queue_test.go (100%) rename internal/{ => runtime}/agent/steer_test.go (100%) rename internal/{ => runtime}/agent/steertext.go (100%) rename internal/{ => runtime}/agent/stream_attempt_id_test.go (100%) rename internal/{ => runtime}/agent/sub_registry.go (97%) rename internal/{ => runtime}/agent/subagent_cancel_test.go (98%) rename internal/{ => runtime}/agent/subagent_cleanup_test.go (96%) rename internal/{ => runtime}/agent/subagent_handoff_shadow.go (97%) rename internal/{ => runtime}/agent/subagent_identity.go (92%) rename internal/{ => runtime}/agent/subagent_list.go (99%) rename internal/{ => runtime}/agent/subagent_list_test.go (98%) rename internal/{ => runtime}/agent/subagent_parent_probe_test.go (98%) rename internal/{ => runtime}/agent/subagent_progress.go (99%) rename internal/{ => runtime}/agent/subagent_progress_test.go (99%) rename internal/{ => runtime}/agent/subagent_registry_test.go (99%) rename internal/{ => runtime}/agent/subagent_report.go (98%) rename internal/{ => runtime}/agent/subagent_report_test.go (97%) rename internal/{ => runtime}/agent/subagent_result.go (99%) rename internal/{ => runtime}/agent/subagent_result_test.go (96%) rename internal/{ => runtime}/agent/subagent_store.go (99%) rename internal/{ => runtime}/agent/subagent_store_test.go (99%) rename internal/{ => runtime}/agent/subagent_store_traversal_test.go (97%) rename internal/{ => runtime}/agent/subagent_terminal.go (100%) rename internal/{ => runtime}/agent/submit_plan.go (98%) rename internal/{ => runtime}/agent/submit_plan_test.go (94%) rename internal/{ => runtime}/agent/summary_verdict_test.go (96%) rename internal/{ => runtime}/agent/task.go (99%) rename internal/{ => runtime}/agent/task_background_queue_test.go (93%) rename internal/{ => runtime}/agent/task_budget.go (100%) rename internal/{ => runtime}/agent/task_budget_gate_test.go (98%) rename internal/{ => runtime}/agent/task_options_test.go (98%) rename internal/{ => runtime}/agent/task_profile_test.go (97%) rename internal/{ => runtime}/agent/task_test.go (99%) rename internal/{ => runtime}/agent/taskpolicy_execution_test.go (95%) rename internal/{ => runtime}/agent/taskstate.go (98%) rename internal/{ => runtime}/agent/taskstate_test.go (99%) rename internal/{ => runtime}/agent/testdata/capability_list.json (100%) rename internal/{ => runtime}/agent/testutil/mock_provider.go (99%) rename internal/{ => runtime}/agent/testutil/mock_provider_test.go (97%) rename internal/{ => runtime}/agent/textsink.go (99%) rename internal/{ => runtime}/agent/textsink_partial_test.go (96%) rename internal/{ => runtime}/agent/textsink_test.go (98%) rename internal/{ => runtime}/agent/textsink_usage_test.go (96%) rename internal/{ => runtime}/agent/title_test.go (100%) rename internal/{ => runtime}/agent/todo_echo.go (94%) rename internal/{ => runtime}/agent/todo_echo_test.go (96%) rename internal/{ => runtime}/agent/todo_progress_shadow.go (95%) rename internal/{ => runtime}/agent/todo_projection.go (97%) rename internal/{ => runtime}/agent/todo_projection_test.go (98%) rename internal/{ => runtime}/agent/todo_state.go (98%) rename internal/{ => runtime}/agent/tool_call_context.go (88%) rename internal/{ => runtime}/agent/tool_facts.go (94%) rename internal/{ => runtime}/agent/tool_failure_identity_test.go (98%) rename internal/{ => runtime}/agent/tool_image_aging.go (97%) rename internal/{ => runtime}/agent/tool_image_aging_test.go (97%) rename internal/{ => runtime}/agent/tool_output_spill.go (98%) rename internal/{ => runtime}/agent/tool_output_spill_test.go (99%) rename internal/{ => runtime}/agent/tool_receipts.go (97%) rename internal/{ => runtime}/agent/toolimages_test.go (97%) rename internal/{ => runtime}/agent/transient_tags_test.go (99%) rename internal/{ => runtime}/agent/turn_phase.go (95%) rename internal/{ => runtime}/agent/turn_phase_test.go (95%) rename internal/{ => runtime}/agent/turnruntime.go (96%) rename internal/{ => runtime}/agent/turnruntime_test.go (100%) rename internal/{ => runtime}/agent/upstream_context.go (100%) rename internal/{ => runtime}/agent/upstream_context_test.go (97%) rename internal/{ => runtime}/agent/usage_accounting_test.go (98%) rename internal/{ => runtime}/agent/usage_context.go (91%) rename internal/{ => runtime}/agent/usage_test.go (97%) rename internal/{ => runtime}/agent/usecapability.go (99%) rename internal/{ => runtime}/agent/usecapability_batching.go (97%) rename internal/{ => runtime}/agent/usecapability_hint.go (98%) rename internal/{ => runtime}/agent/usecapability_hint_test.go (99%) rename internal/{ => runtime}/agent/usecapability_search.go (98%) rename internal/{ => runtime}/agent/usecapability_search_test.go (98%) rename internal/{ => runtime}/agent/usecapability_test.go (97%) rename internal/{ => runtime}/agent/user_input.go (100%) rename internal/{ => runtime}/agent/user_input_test.go (98%) rename internal/{ => runtime}/agent/verification_class_live_test.go (96%) rename internal/{ => runtime}/agent/visible_final_test.go (98%) rename internal/{ => runtime}/agent/vision_note_test.go (100%) rename internal/{ => runtime}/agent/vision_routing.go (100%) rename internal/{ => runtime}/agent/vision_routing_test.go (100%) rename internal/{ => runtime}/agent/width.go (100%) rename internal/{ => runtime}/agent/width_test.go (100%) rename internal/{ => runtime}/agent/workspace_block.go (100%) rename internal/{ => runtime}/agent/workspace_block_test.go (100%) rename internal/{ => runtime}/agent/workspace_lease_test.go (95%) rename internal/{ => runtime}/agent/workspace_mutation.go (97%) rename internal/{ => runtime}/agent/workspace_mutation_test.go (96%) rename internal/{ => runtime}/agent/write_claims.go (100%) rename internal/{ => runtime}/agent/write_claims_adversarial_test.go (98%) rename internal/{ => runtime}/agent/write_claims_test.go (99%) rename internal/{ => runtime}/agent/write_grant.go (100%) rename internal/{ => runtime}/agent/write_grant_test.go (97%) rename internal/{ => runtime}/agent/zz_probe2_test.go (86%) rename internal/{ => runtime}/capability/audit.go (100%) rename internal/{ => runtime}/capability/capability.go (99%) rename internal/{ => runtime}/capability/capability_test.go (99%) rename internal/{ => runtime}/capability/catalog.go (98%) rename internal/{ => runtime}/capability/catalog_cache_test.go (98%) rename internal/{ => runtime}/capability/catalog_test.go (100%) rename internal/{ => runtime}/capability/ledger.go (100%) rename internal/{ => runtime}/capability/ledger_test.go (100%) rename internal/{ => runtime}/capability/semantic.go (99%) rename internal/{ => runtime}/capability/semantic_test.go (97%) rename internal/{ => runtime}/completion/claim.go (98%) rename internal/{ => runtime}/completion/claim_test.go (99%) rename internal/{ => runtime}/completion/doc.go (100%) rename internal/{ => runtime}/completion/report.go (99%) rename internal/{ => runtime}/completion/report_test.go (99%) rename internal/{ => runtime}/completion/verification_verdict_test.go (98%) rename internal/{ => runtime}/evidence/background_lease.go (100%) rename internal/{ => runtime}/evidence/baseline.go (100%) rename internal/{ => runtime}/evidence/baseline_test.go (100%) rename internal/{ => runtime}/evidence/child.go (100%) rename internal/{ => runtime}/evidence/child_test.go (92%) rename internal/{ => runtime}/evidence/cited_check_test.go (100%) rename internal/{ => runtime}/evidence/commandmatch.go (98%) rename internal/{ => runtime}/evidence/commandmatch_test.go (91%) rename internal/{ => runtime}/evidence/completion_report.go (100%) rename internal/{ => runtime}/evidence/delegation_audit.go (100%) rename internal/{ => runtime}/evidence/evidence.go (99%) rename internal/{ => runtime}/evidence/evidence_test.go (100%) rename internal/{ => runtime}/evidence/goal_progress.go (100%) rename internal/{ => runtime}/evidence/goal_progress_test.go (100%) rename internal/{ => runtime}/evidence/ledger_queries.go (100%) rename internal/{ => runtime}/evidence/meta.go (100%) rename internal/{ => runtime}/evidence/mutation_class.go (97%) rename internal/{ => runtime}/evidence/mutation_class_test.go (98%) rename internal/{ => runtime}/evidence/mutation_scan.go (99%) rename internal/{ => runtime}/evidence/mutation_scan_test.go (100%) rename internal/{ => runtime}/evidence/named_paths.go (100%) rename internal/{ => runtime}/evidence/named_paths_test.go (99%) rename internal/{ => runtime}/evidence/obligation.go (100%) rename internal/{ => runtime}/evidence/obligation_test.go (100%) rename internal/{ => runtime}/evidence/opaque_interpreter.go (95%) rename internal/{ => runtime}/evidence/outcome.go (99%) rename internal/{ => runtime}/evidence/outcome_test.go (100%) rename internal/{ => runtime}/evidence/path_role.go (98%) rename internal/{ => runtime}/evidence/path_role_test.go (95%) rename internal/{ => runtime}/evidence/pipe_status_verdict_test.go (100%) rename internal/{ => runtime}/evidence/progress.go (100%) rename internal/{ => runtime}/evidence/progress_test.go (100%) rename internal/{ => runtime}/evidence/readiness_audit.go (100%) rename internal/{ => runtime}/evidence/readiness_test.go (100%) rename internal/{ => runtime}/evidence/receipt.go (100%) rename internal/{ => runtime}/evidence/render.go (100%) rename internal/{ => runtime}/evidence/render_test.go (100%) rename internal/{ => runtime}/evidence/review_authority.go (100%) rename internal/{ => runtime}/evidence/review_authority_test.go (100%) rename internal/{ => runtime}/evidence/review_report.go (100%) rename internal/{ => runtime}/evidence/risk.go (99%) rename internal/{ => runtime}/evidence/shell_contract_test.go (100%) rename internal/{ => runtime}/evidence/shown.go (100%) rename internal/{ => runtime}/evidence/shown_test.go (100%) rename internal/{ => runtime}/evidence/test_criteria.go (100%) rename internal/{ => runtime}/evidence/test_criteria_test.go (100%) rename internal/{ => runtime}/evidence/testcriteria.go (100%) rename internal/{ => runtime}/evidence/testcriteria_test.go (99%) rename internal/{ => runtime}/evidence/todo_identity.go (100%) rename internal/{ => runtime}/evidence/todo_progress.go (100%) rename internal/{ => runtime}/evidence/todo_progress_test.go (100%) rename internal/{ => runtime}/evidence/todos.go (100%) rename internal/{ => runtime}/evidence/tool_facts.go (100%) rename internal/{ => runtime}/evidence/user_gate.go (100%) rename internal/{ => runtime}/evidence/verification_command.go (99%) rename internal/{ => runtime}/evidence/verification_contract.go (100%) rename internal/{ => runtime}/evidence/verification_exit.go (99%) rename internal/{ => runtime}/evidence/verification_exit_test.go (100%) rename internal/{ => runtime}/evidence/verification_summary_test.go (100%) rename internal/{ => runtime}/evidence/whole_command_exit_test.go (100%) rename internal/{ => runtime}/goaleval/evaluator.go (98%) rename internal/{ => runtime}/goaleval/evaluator_test.go (98%) rename internal/{ => runtime}/jobs/artifacts.go (98%) rename internal/{ => runtime}/jobs/artifacts_test.go (98%) rename internal/{ => runtime}/jobs/completion.go (98%) rename internal/{ => runtime}/jobs/completion_test.go (99%) rename internal/{ => runtime}/jobs/concurrency_stress_test.go (96%) rename internal/{ => runtime}/jobs/context_isolation_test.go (100%) rename internal/{ => runtime}/jobs/jobs.go (99%) rename internal/{ => runtime}/jobs/jobs_extra_test.go (99%) rename internal/{ => runtime}/jobs/jobs_recorder_test.go (99%) rename internal/{ => runtime}/jobs/jobs_security_test.go (98%) rename internal/{ => runtime}/jobs/jobs_sessionpath_test.go (98%) rename internal/{ => runtime}/jobs/jobs_test.go (99%) rename internal/{ => runtime}/jobs/main_test.go (100%) rename internal/{ => runtime}/jobs/output_result_test.go (96%) rename internal/{ => runtime}/jobs/progress.go (100%) rename internal/{ => runtime}/jobs/watch.go (100%) rename internal/{ => runtime}/jobs/watch_test.go (99%) rename internal/{ => runtime}/outputstyle/outputstyle.go (98%) rename internal/{ => runtime}/outputstyle/outputstyle_test.go (97%) rename internal/{ => runtime}/promptrefine/refine.go (97%) rename internal/{ => runtime}/promptrefine/refine_test.go (97%) rename internal/{ => runtime}/recovery/cache_shape_test.go (94%) rename internal/{ => runtime}/recovery/decision.go (100%) rename internal/{ => runtime}/recovery/decision_test.go (100%) rename internal/{ => runtime}/recovery/fingerprint.go (100%) rename internal/{ => runtime}/recovery/gate.go (99%) rename internal/{ => runtime}/recovery/gate_restore.go (100%) rename internal/{ => runtime}/recovery/gate_test.go (100%) rename internal/{ => runtime}/recovery/persist.go (91%) rename internal/{ => runtime}/recovery/persist_test.go (99%) rename internal/{ => runtime}/recovery/reviewer.go (98%) rename internal/{ => runtime}/recovery/reviewer_test.go (99%) rename internal/{ => runtime}/recovery/rules.go (99%) rename internal/{ => runtime}/recovery/state.go (100%) rename internal/{ => runtime}/recovery/types.go (99%) rename internal/{ => runtime}/taskmonitor/control.go (100%) rename internal/{ => runtime}/taskmonitor/control_test.go (99%) rename internal/{ => runtime}/taskmonitor/event_tail.go (100%) rename internal/{ => runtime}/taskmonitor/event_tail_test.go (97%) rename internal/{ => runtime}/taskmonitor/filelock_unix.go (100%) rename internal/{ => runtime}/taskmonitor/filelock_windows.go (100%) rename internal/{ => runtime}/taskmonitor/jsonstore.go (99%) rename internal/{ => runtime}/taskmonitor/jsonstore_test.go (99%) rename internal/{ => runtime}/taskmonitor/memory.go (100%) rename internal/{ => runtime}/taskmonitor/model.go (100%) rename internal/{ => runtime}/taskmonitor/model_test.go (100%) rename internal/{ => runtime}/taskmonitor/projection_sink_test.go (97%) rename internal/{ => runtime}/taskmonitor/recorder.go (99%) rename internal/{ => runtime}/taskmonitor/recorder_test.go (99%) rename internal/{ => runtime}/taskmonitor/store.go (100%) rename internal/{ => runtime}/taskmonitor/tmux.go (100%) rename internal/{ => runtime}/taskmonitor/tmux_test.go (99%) rename internal/{ => runtime}/taskpolicy/context.go (100%) rename internal/{ => runtime}/taskpolicy/policy.go (98%) rename internal/{ => runtime}/taskpolicy/policy_test.go (98%) rename internal/{ => safety}/guardian/guardian.go (98%) rename internal/{ => safety}/guardian/guardian_policy.md (100%) rename internal/{ => safety}/guardian/guardian_test.go (99%) rename internal/{ => safety}/guardian/policy.go (100%) rename internal/{ => safety}/guardian/transcript.go (99%) rename internal/{ => safety}/permission/bash_approval.go (99%) rename internal/{ => safety}/permission/bash_approval_test.go (100%) rename internal/{ => safety}/permission/bash_decompose.go (97%) rename internal/{ => safety}/permission/bash_decompose_test.go (100%) rename internal/{ => safety}/permission/bash_destructive_git_test.go (100%) rename internal/{ => safety}/permission/bash_readonly.go (98%) rename internal/{ => safety}/permission/bash_readonly_test.go (100%) rename internal/{ => safety}/permission/bash_redirect.go (78%) rename internal/{ => safety}/permission/bash_redirect_test.go (100%) rename internal/{ => safety}/permission/browser_credential.go (100%) rename internal/{ => safety}/permission/browser_grant_test.go (100%) rename internal/{ => safety}/permission/computer.go (100%) rename internal/{ => safety}/permission/computer_test.go (100%) rename internal/{ => safety}/permission/install_source.go (100%) rename internal/{ => safety}/permission/install_source_test.go (100%) rename internal/{ => safety}/permission/permission.go (99%) rename internal/{ => safety}/permission/permission_extra_test.go (98%) rename internal/{ => safety}/permission/permission_test.go (100%) rename internal/{ => safety}/permission/rule_group.go (100%) rename internal/{ => safety}/permission/subject.go (100%) rename internal/{ => safety}/permission/write_fence.go (100%) rename internal/{ => safety}/permission/write_fence_test.go (100%) rename internal/{ => safety}/redirectguard/redirectguard.go (100%) rename internal/{ => safety}/redirectguard/redirectguard_test.go (100%) rename internal/{ => safety}/sandbox/authority.go (100%) rename internal/{ => safety}/sandbox/authority_endpoint.go (100%) rename internal/{ => safety}/sandbox/authority_test.go (100%) rename internal/{ => safety}/sandbox/escape.go (98%) rename internal/{ => safety}/sandbox/host_authority_test.go (100%) rename internal/{ => safety}/sandbox/prepare.go (100%) rename internal/{ => safety}/sandbox/prepare_linux.go (100%) rename internal/{ => safety}/sandbox/prepare_other.go (100%) rename internal/{ => safety}/sandbox/prepare_test.go (100%) rename internal/{ => safety}/sandbox/sandbox.go (100%) rename internal/{ => safety}/sandbox/sandbox_test.go (99%) rename internal/{ => safety}/sandbox/seatbelt_darwin.go (100%) rename internal/{ => safety}/sandbox/seatbelt_darwin_test.go (99%) rename internal/{ => safety}/sandbox/seatbelt_other.go (99%) rename internal/{ => safety}/sandbox/seatbelt_other_test.go (99%) rename internal/{ => safety}/sandbox/seatbelt_windows.go (100%) rename internal/{ => safety}/sandbox/seatbelt_windows_test.go (100%) rename internal/{ => safety}/sandbox/session_temp_env.go (100%) rename internal/{ => safety}/sandbox/session_temp_env_test.go (100%) rename internal/{ => safety}/sandbox/shell.go (99%) rename internal/{ => safety}/sandbox/shell_detect_test.go (100%) rename internal/{ => safety}/sandbox/shell_nul_test.go (100%) rename internal/{ => safety}/shellsafe/bash_redirect.go (99%) rename internal/{ => safety}/shellsafe/bash_redirect_test.go (100%) rename internal/{ => safety}/shellsafe/inline_code.go (100%) rename internal/{ => safety}/shellsafe/inline_code_test.go (100%) rename internal/{ => safety}/shellsafe/readonly_args.go (100%) rename internal/{ => safety}/shellsafe/readonly_args_test.go (100%) rename internal/{ => safety}/shellsafe/shellsafe.go (99%) rename internal/{ => safety}/shellsafe/shellsafe_test.go (100%) rename internal/{ => safety}/typesafe/client.go (100%) rename internal/{ => safety}/typesafe/client_test.go (100%) rename internal/{ => session}/control/adjudication.go (99%) rename internal/{ => session}/control/adjudication_test.go (98%) rename internal/{ => session}/control/admission_generation_test.go (97%) rename internal/{ => session}/control/admission_guard.go (97%) rename internal/{ => session}/control/admission_test.go (99%) rename internal/{ => session}/control/adopt_notice_test.go (93%) rename internal/{ => session}/control/approval.go (99%) rename internal/{ => session}/control/approval_bridge.go (98%) rename internal/{ => session}/control/approval_browser_test.go (98%) rename internal/{ => session}/control/approval_computer_test.go (99%) rename internal/{ => session}/control/approval_e2e_test.go (98%) rename internal/{ => session}/control/approval_mode_test.go (100%) rename internal/{ => session}/control/approval_orchestration.go (98%) rename internal/{ => session}/control/ask_e2e_test.go (96%) rename internal/{ => session}/control/ask_queue_test.go (98%) rename internal/{ => session}/control/attachment_root_test.go (99%) rename internal/{ => session}/control/attachments.go (99%) rename internal/{ => session}/control/attachments_test.go (98%) rename internal/{ => session}/control/audit_test.go (98%) rename internal/{ => session}/control/auto_plan_e2e_test.go (97%) rename internal/{ => session}/control/bash_dynamic_approval_test.go (98%) rename internal/{ => session}/control/boundary.go (99%) rename internal/{ => session}/control/branches.go (99%) rename internal/{ => session}/control/branches_test.go (98%) rename internal/{ => session}/control/browser_open_test.go (98%) rename internal/{ => session}/control/capability.go (97%) rename internal/{ => session}/control/capability_scope.go (97%) rename internal/{ => session}/control/capability_scope_test.go (98%) rename internal/{ => session}/control/capability_test.go (97%) rename internal/{ => session}/control/chat_run_budget_test.go (95%) rename internal/{ => session}/control/checkpoint.go (98%) rename internal/{ => session}/control/checkpoint_prompt_test.go (95%) rename internal/{ => session}/control/close_idempotent_test.go (94%) rename internal/{ => session}/control/compaction_settings.go (98%) rename internal/{ => session}/control/complete.go (99%) rename internal/{ => session}/control/complete_test.go (99%) rename internal/{ => session}/control/config_problem.go (98%) rename internal/{ => session}/control/config_write_approval_test.go (98%) rename internal/{ => session}/control/context_command.go (99%) rename internal/{ => session}/control/context_command_test.go (98%) rename internal/{ => session}/control/context_status.go (91%) rename internal/{ => session}/control/controller.go (97%) rename internal/{ => session}/control/controller_deps.go (92%) rename internal/{ => session}/control/controller_lock_test.go (96%) rename internal/{ => session}/control/controller_test.go (99%) rename internal/{ => session}/control/decisions.go (99%) rename internal/{ => session}/control/decisions_test.go (99%) rename internal/{ => session}/control/display_prefs.go (94%) rename internal/{ => session}/control/docs_command.go (95%) rename internal/{ => session}/control/dropped.go (100%) rename internal/{ => session}/control/errmsg.go (97%) rename internal/{ => session}/control/errmsg_test.go (99%) rename internal/{ => session}/control/execution.go (98%) rename internal/{ => session}/control/execution_graph.go (95%) rename internal/{ => session}/control/execution_test.go (97%) rename internal/{ => session}/control/extension_ui.go (98%) rename internal/{ => session}/control/extension_ui_test.go (97%) rename internal/{ => session}/control/extensions.go (97%) rename internal/{ => session}/control/extensions_test.go (98%) rename internal/{ => session}/control/external_folders.go (100%) rename internal/{ => session}/control/frontend_sink_capability_test.go (94%) rename internal/{ => session}/control/generation.go (97%) rename internal/{ => session}/control/goal.go (99%) rename internal/{ => session}/control/goal_boundary_runtime_test.go (98%) rename internal/{ => session}/control/goal_command.go (93%) rename internal/{ => session}/control/goal_concurrency_test.go (94%) rename internal/{ => session}/control/goal_contract_test.go (100%) rename internal/{ => session}/control/goal_control.go (98%) rename internal/{ => session}/control/goal_durable.go (98%) rename internal/{ => session}/control/goal_durable_test.go (93%) rename internal/{ => session}/control/goal_input_compat_test.go (100%) rename internal/{ => session}/control/goal_legacy.go (100%) rename internal/{ => session}/control/goal_legacy_restore_test.go (95%) rename internal/{ => session}/control/goal_progress.go (100%) rename internal/{ => session}/control/goal_resume_project_check_test.go (96%) rename internal/{ => session}/control/goal_run_ceiling_test.go (94%) rename internal/{ => session}/control/goal_runtime_test.go (98%) rename internal/{ => session}/control/goal_runtime_view.go (100%) rename internal/{ => session}/control/goal_snapshot_contract_test.go (100%) rename internal/{ => session}/control/goal_spend_budget_test.go (95%) rename internal/{ => session}/control/goal_state_compat.go (100%) rename internal/{ => session}/control/goal_test.go (99%) rename internal/{ => session}/control/goal_verification.go (96%) rename internal/{ => session}/control/goalusage.go (97%) rename internal/{ => session}/control/headless_approval_test.go (98%) rename internal/{ => session}/control/history_log.go (94%) rename internal/{ => session}/control/hooks.go (98%) rename internal/{ => session}/control/host_authored_test.go (93%) rename internal/{ => session}/control/inbox.go (99%) rename internal/{ => session}/control/inbox_cancel_test.go (94%) rename internal/{ => session}/control/inbox_dispatch.go (98%) rename internal/{ => session}/control/inbox_dispatch_test.go (98%) rename internal/{ => session}/control/inbox_orphan_recovery_test.go (98%) rename internal/{ => session}/control/inbox_refs.go (97%) rename internal/{ => session}/control/inbox_run.go (98%) rename internal/{ => session}/control/inbox_sink.go (96%) rename internal/{ => session}/control/inbox_steer.go (99%) rename internal/{ => session}/control/inbox_test.go (98%) rename internal/{ => session}/control/input.go (98%) rename internal/{ => session}/control/input_test.go (99%) rename internal/{ => session}/control/inputimages_test.go (98%) rename internal/{ => session}/control/jobs_bridge.go (98%) rename internal/{ => session}/control/jobs_bridge_test.go (97%) rename internal/{ => session}/control/main_test.go (92%) rename internal/{ => session}/control/mcp.go (99%) rename internal/{ => session}/control/mcp_admin.go (99%) rename internal/{ => session}/control/mcp_cached_facts_test.go (96%) rename internal/{ => session}/control/mcp_catalog_test.go (98%) rename internal/{ => session}/control/mcp_remove_oauth.go (91%) rename internal/{ => session}/control/mcp_servers.go (99%) rename internal/{ => session}/control/memory.go (99%) rename internal/{ => session}/control/memory_command.go (99%) rename internal/{ => session}/control/memory_recall_audit_test.go (88%) rename internal/{ => session}/control/memory_test.go (99%) rename internal/{ => session}/control/network.go (98%) rename internal/{ => session}/control/no_runner_test.go (100%) rename internal/{ => session}/control/plan_seed_test.go (98%) rename internal/{ => session}/control/plan_todos.go (98%) rename internal/{ => session}/control/planlifecycle.go (98%) rename internal/{ => session}/control/planner_gate.go (97%) rename internal/{ => session}/control/planner_gate_test.go (99%) rename internal/{ => session}/control/port.go (96%) rename internal/{ => session}/control/port_segregation_test.go (100%) rename internal/{ => session}/control/prefix.go (95%) rename internal/{ => session}/control/producer_attribution_test.go (92%) rename internal/{ => session}/control/project_modules.go (100%) rename internal/{ => session}/control/projection_bind.go (96%) rename internal/{ => session}/control/projection_bind_test.go (97%) rename internal/{ => session}/control/projection_debt.go (100%) rename internal/{ => session}/control/prompt_ids_test.go (97%) rename internal/{ => session}/control/prompt_refine.go (93%) rename internal/{ => session}/control/prompt_refine_test.go (95%) rename internal/{ => session}/control/readiness_continuation.go (97%) rename internal/{ => session}/control/readiness_continuation_test.go (98%) rename internal/{ => session}/control/recovery.go (99%) rename internal/{ => session}/control/recovery_e2e_test.go (92%) rename internal/{ => session}/control/recovery_test.go (98%) rename internal/{ => session}/control/refimages.go (98%) rename internal/{ => session}/control/refs.go (99%) rename internal/{ => session}/control/refs_test.go (99%) rename internal/{ => session}/control/refusal_hint_test.go (95%) rename internal/{ => session}/control/replay_pending_test.go (98%) rename internal/{ => session}/control/response_format_test.go (98%) rename internal/{ => session}/control/resume_prune_test.go (97%) rename internal/{ => session}/control/rewind.go (98%) rename internal/{ => session}/control/rewind_e2e_test.go (98%) rename internal/{ => session}/control/rule_allows_test.go (97%) rename internal/{ => session}/control/run_ceiling.go (94%) rename internal/{ => session}/control/runtime_status_test.go (99%) rename internal/{ => session}/control/session_artifacts_test.go (90%) rename internal/{ => session}/control/session_destroy.go (95%) rename internal/{ => session}/control/session_grant_test.go (98%) rename internal/{ => session}/control/session_lease_keeper.go (99%) rename internal/{ => session}/control/session_lease_keeper_test.go (97%) rename internal/{ => session}/control/session_lease_reclaim_test.go (98%) rename internal/{ => session}/control/session_lifecycle.go (98%) rename internal/{ => session}/control/session_readonly_attach_test.go (97%) rename internal/{ => session}/control/session_snapshot.go (98%) rename internal/{ => session}/control/session_temp_test.go (97%) rename internal/{ => session}/control/session_write_authority.go (97%) rename internal/{ => session}/control/session_write_authority_admission_test.go (96%) rename internal/{ => session}/control/sessionpath.go (97%) rename internal/{ => session}/control/shell.go (96%) rename internal/{ => session}/control/shell_kill_other.go (100%) rename internal/{ => session}/control/shell_kill_other_test.go (100%) rename internal/{ => session}/control/shell_kill_windows.go (95%) rename internal/{ => session}/control/shell_settings_test.go (98%) rename internal/{ => session}/control/shell_test.go (98%) rename internal/{ => session}/control/skill.go (99%) rename internal/{ => session}/control/skill_catalog_test.go (96%) rename internal/{ => session}/control/slash.go (99%) rename internal/{ => session}/control/slash_catalog.go (97%) rename internal/{ => session}/control/slash_resolution.go (97%) rename internal/{ => session}/control/slash_resolution_test.go (97%) rename internal/{ => session}/control/slash_test.go (99%) rename internal/{ => session}/control/snapshot_conflict_diagnostic.go (97%) rename internal/{ => session}/control/snapshot_same_revision.go (98%) rename internal/{ => session}/control/steer_delivery_test.go (94%) rename internal/{ => session}/control/steer_fallback_test.go (96%) rename internal/{ => session}/control/subagent_goal_work_duration_test.go (94%) rename internal/{ => session}/control/synchronous_turn.go (95%) rename internal/{ => session}/control/tool_issuer_test.go (98%) rename internal/{ => session}/control/turn_boundary_matrix_test.go (97%) rename internal/{ => session}/control/turn_cancel.go (99%) rename internal/{ => session}/control/turn_checkpoint_event_test.go (98%) rename internal/{ => session}/control/turn_completion_test.go (98%) rename internal/{ => session}/control/turn_entry.go (97%) rename internal/{ => session}/control/turn_gate.go (100%) rename internal/{ => session}/control/turn_identity_test.go (93%) rename internal/{ => session}/control/turn_images.go (98%) rename internal/{ => session}/control/turn_images_test.go (98%) rename internal/{ => session}/control/turn_orchestrator.go (98%) rename internal/{ => session}/control/turn_orchestrator_test.go (99%) rename internal/{ => session}/control/turn_projection.go (97%) rename internal/{ => session}/control/turn_projection_test.go (98%) rename internal/{ => session}/control/turn_submit.go (99%) rename internal/{ => session}/control/usage_tally.go (97%) rename internal/{ => session}/control/usage_tally_test.go (96%) rename internal/{ => session}/control/user_gate.go (97%) rename internal/{ => session}/control/user_gate_test.go (96%) rename internal/{ => session}/control/workspace_lease.go (92%) rename internal/{ => session}/control/yolo_test.go (99%) rename internal/{ => state}/checkpoint/atomic_json.go (95%) rename internal/{ => state}/checkpoint/barrier.go (100%) rename internal/{ => state}/checkpoint/blob.go (99%) rename internal/{ => state}/checkpoint/capture.go (99%) rename internal/{ => state}/checkpoint/checkpoint.go (99%) rename internal/{ => state}/checkpoint/checkpoint_test.go (99%) rename internal/{ => state}/checkpoint/file_revert.go (99%) rename internal/{ => state}/checkpoint/nlink_unix.go (100%) rename internal/{ => state}/checkpoint/nlink_windows.go (100%) rename internal/{ => state}/checkpoint/observer.go (99%) rename internal/{ => state}/checkpoint/secure_path_fallback.go (100%) rename internal/{ => state}/checkpoint/secure_path_unix.go (100%) rename internal/{ => state}/checkpoint/transaction.go (99%) rename internal/{ => state}/checkpoint/transaction_test.go (99%) rename internal/{ => state}/checkpoint/types.go (99%) rename internal/{ => state}/execgraph/doc.go (100%) rename internal/{ => state}/execgraph/rebuild.go (98%) rename internal/{ => state}/execgraph/rebuild_test.go (99%) rename internal/{ => state}/execjournal/doc.go (100%) rename internal/{ => state}/execjournal/journal.go (99%) rename internal/{ => state}/execjournal/journal_test.go (99%) rename internal/{ => state}/history/indexed.go (98%) rename internal/{ => state}/history/indexed_lifecycle_test.go (95%) rename internal/{ => state}/history/indexed_rebuild.go (97%) rename internal/{ => state}/history/indexed_rebuild_test.go (95%) rename internal/{ => state}/history/lifecycle_close_test.go (93%) rename internal/{ => state}/history/search.go (98%) rename internal/{ => state}/history/search_test.go (98%) rename internal/{ => state}/history/strip.go (95%) rename internal/{ => state}/history/tool.go (98%) rename internal/{ => state}/history/tool_test.go (98%) rename internal/{ => state}/historycatalog/benchmark_test.go (100%) rename internal/{ => state}/historycatalog/catalog.go (99%) rename internal/{ => state}/historycatalog/catalog_test.go (98%) rename internal/{ => state}/historycatalog/close_lifecycle_test.go (100%) rename internal/{ => state}/historycatalog/documents.go (95%) rename internal/{ => state}/historycatalog/incremental.go (97%) rename internal/{ => state}/historycatalog/rebuild.go (97%) rename internal/{ => state}/historycatalog/rebuild_test.go (96%) rename internal/{ => state}/historycatalog/rebuild_tokenizer_test.go (95%) rename internal/{ => state}/historycatalog/schema.go (98%) rename internal/{ => state}/historycatalog/types.go (97%) rename internal/{ => state}/instruction/instruction.go (100%) rename internal/{ => state}/instruction/instruction_test.go (100%) rename internal/{ => state}/instruction/render.go (100%) rename internal/{ => state}/instruction/resolver.go (99%) rename internal/{ => state}/instruction/resolver_test.go (99%) rename internal/{ => state}/memory/activation.go (100%) rename internal/{ => state}/memory/activation_test.go (100%) rename internal/{ => state}/memory/auto_recall.go (99%) rename internal/{ => state}/memory/auto_recall_test.go (99%) rename internal/{ => state}/memory/bounded_name_test.go (97%) rename internal/{ => state}/memory/convention_test.go (98%) rename internal/{ => state}/memory/doc.go (95%) rename internal/{ => state}/memory/forget.go (98%) rename internal/{ => state}/memory/forget_test.go (99%) rename internal/{ => state}/memory/freshness.go (100%) rename internal/{ => state}/memory/freshness_test.go (100%) rename internal/{ => state}/memory/index.go (100%) rename internal/{ => state}/memory/index_scope_test.go (100%) rename internal/{ => state}/memory/keywords_recall_test.go (100%) rename internal/{ => state}/memory/memory.go (99%) rename internal/{ => state}/memory/memory_test.go (99%) rename internal/{ => state}/memory/prefix_cost_test.go (99%) rename internal/{ => state}/memory/queue.go (100%) rename internal/{ => state}/memory/queue_context_test.go (100%) rename internal/{ => state}/memory/quickadd.go (97%) rename internal/{ => state}/memory/quickadd_test.go (98%) rename internal/{ => state}/memory/recall.go (99%) rename internal/{ => state}/memory/recall_index.go (98%) rename internal/{ => state}/memory/recall_index_test.go (98%) rename internal/{ => state}/memory/recall_test.go (99%) rename internal/{ => state}/memory/remember.go (99%) rename internal/{ => state}/memory/remember_policy.go (99%) rename internal/{ => state}/memory/remember_policy_test.go (99%) rename internal/{ => state}/memory/remember_test.go (99%) rename internal/{ => state}/memory/render.go (100%) rename internal/{ => state}/memory/shadow_recall_test.go (100%) rename internal/{ => state}/memory/store.go (99%) rename internal/{ => state}/memory/store_extra_test.go (99%) rename internal/{ => state}/memory/store_test.go (99%) rename internal/{ => state}/memory/store_v2.go (99%) rename internal/{ => state}/memory/store_v2_test.go (99%) rename internal/{ => state}/memory/subject.go (100%) rename internal/{ => state}/memory/subject_test.go (100%) rename internal/{ => state}/memory/writedoc_test.go (98%) rename internal/{ => state}/migration/migration.go (99%) rename internal/{ => state}/migration/migration_test.go (99%) rename internal/{ => state}/migration/relocated_state.go (96%) rename internal/{ => state}/migration/relocated_state_test.go (97%) rename internal/{ => state}/projectiondb/projectiondb.go (99%) rename internal/{ => state}/projectiondb/projectiondb_test.go (99%) rename internal/{ => state}/projectiondb/remote_fs_darwin.go (100%) rename internal/{ => state}/projectiondb/remote_fs_linux.go (100%) rename internal/{ => state}/projectiondb/remote_fs_other.go (100%) rename internal/{ => state}/projectiondb/remote_fs_windows.go (100%) rename internal/{ => state}/sessioninbox/admission_benchmark_test.go (98%) rename internal/{ => state}/sessioninbox/disk.go (99%) rename internal/{ => state}/sessioninbox/doc.go (100%) rename internal/{ => state}/sessioninbox/idempotency_store.go (100%) rename internal/{ => state}/sessioninbox/ids.go (100%) rename internal/{ => state}/sessioninbox/manifest.go (100%) rename internal/{ => state}/sessioninbox/metrics.go (100%) rename internal/{ => state}/sessioninbox/ops.go (100%) rename internal/{ => state}/sessioninbox/recovery.go (100%) rename internal/{ => state}/sessioninbox/recovery_test.go (98%) rename internal/{ => state}/sessioninbox/refs.go (100%) rename internal/{ => state}/sessioninbox/store.go (99%) rename internal/{ => state}/sessioninbox/store_test.go (99%) rename internal/{ => state}/sessioninbox/types.go (100%) rename internal/{ => state}/sessiontemp/context.go (100%) rename internal/{ => state}/sessiontemp/context_deadline.go (100%) rename internal/{ => state}/sessiontemp/manager.go (99%) rename internal/{ => state}/sessiontemp/manager_test.go (99%) rename internal/{ => state}/sessiontemp/manager_test_helpers.go (74%) rename internal/{ => state}/stats/cost_test.go (99%) rename internal/{ => state}/stats/query.go (99%) rename internal/{ => state}/stats/record.go (99%) rename internal/{ => state}/stats/recorder.go (98%) rename internal/{ => state}/stats/stats_test.go (99%) rename internal/{ => state}/stats/usage_catalog.go (98%) rename internal/{ => state}/stats/usage_catalog_lifecycle_test.go (95%) rename internal/{ => state}/storage/adopt_test.go (99%) rename internal/{ => state}/storage/marker.go (99%) rename internal/{ => state}/storage/move.go (99%) rename internal/{ => state}/storage/move_test.go (99%) rename internal/{ => state}/storage/preflight.go (98%) rename internal/{ => state}/storage/survey.go (98%) rename internal/{ => state}/storage/survey_test.go (98%) rename internal/{ => state}/storage/volume_unix.go (100%) rename internal/{ => state}/storage/volume_windows.go (100%) rename internal/{ => state}/store/remote.go (96%) rename internal/{ => state}/store/remote_test.go (100%) rename internal/{ => state}/store/remove_artifacts_test.go (98%) rename internal/{ => state}/store/session.go (98%) rename internal/{ => state}/store/session_test.go (100%) rename internal/{ => state}/store/subagent_name_test.go (100%) rename internal/{ => state}/trajectory/audit_routing_test.go (96%) rename internal/{ => state}/trajectory/coalesce_test.go (98%) rename internal/{ => state}/trajectory/recorder.go (99%) rename internal/{ => state}/trajectory/recorder_test.go (98%) rename internal/{ => state}/usagecatalog/benchmark_test.go (100%) rename internal/{ => state}/usagecatalog/catalog.go (99%) rename internal/{ => state}/usagecatalog/catalog_test.go (98%) rename internal/{ => state}/usagecatalog/close_lifecycle_test.go (95%) rename internal/{ => state}/usagecatalog/rebuild.go (97%) rename internal/{ => state}/usagecatalog/rebuild_test.go (97%) rename internal/{ => state}/usagereport/usagereport.go (98%) rename internal/{ => state}/workgroup/doc.go (100%) rename internal/{ => state}/workgroup/workgroup.go (98%) rename internal/{ => state}/workspacelease/lease.go (99%) rename internal/{ => state}/workspacelease/lease_test.go (99%) rename internal/{ => state}/workspacelease/lock_unix.go (100%) rename internal/{ => state}/workspacelease/lock_windows.go (100%) rename internal/{ => state}/workspacelease/stats.go (100%) rename internal/{ => state}/workspacelease/stats_test.go (100%) rename internal/{tool => tools}/builtin/bash.go (98%) rename internal/{tool => tools}/builtin/bash_cancel_test.go (95%) rename internal/{tool => tools}/builtin/bash_cancel_windows_test.go (98%) rename internal/{tool => tools}/builtin/bash_env_test.go (97%) rename internal/{tool => tools}/builtin/bash_external.go (97%) rename internal/{tool => tools}/builtin/bash_external_test.go (98%) rename internal/{tool => tools}/builtin/bash_foreground.go (96%) rename internal/{tool => tools}/builtin/bash_heredoc_test.go (98%) rename internal/{tool => tools}/builtin/bash_nul.go (97%) rename internal/{tool => tools}/builtin/bash_nul_test.go (96%) rename internal/{tool => tools}/builtin/bash_powershell_test.go (98%) rename internal/{tool => tools}/builtin/bash_reap_test.go (98%) rename internal/{tool => tools}/builtin/bash_sandbox_escape_test.go (98%) rename internal/{tool => tools}/builtin/bash_session_temp_test.go (97%) rename internal/{tool => tools}/builtin/bash_timeout_test.go (99%) rename internal/{tool => tools}/builtin/bgjobs.go (98%) rename internal/{tool => tools}/builtin/bgjobs_test.go (98%) rename internal/{tool => tools}/builtin/browser.go (99%) rename internal/{tool => tools}/builtin/browser_test.go (99%) rename internal/{tool => tools}/builtin/builtin_test.go (99%) rename internal/{tool => tools}/builtin/clientio.go (100%) rename internal/{tool => tools}/builtin/clientio_test.go (98%) rename internal/{tool => tools}/builtin/codeindex.go (99%) rename internal/{tool => tools}/builtin/codeindex_test.go (99%) rename internal/{tool => tools}/builtin/codeindex_treesitter.go (100%) rename internal/{tool => tools}/builtin/codeindex_treesitter_stub.go (100%) rename internal/{tool => tools}/builtin/codeindex_treesitter_test.go (97%) rename internal/{tool => tools}/builtin/completestep.go (99%) rename internal/{tool => tools}/builtin/completestep_test.go (98%) rename internal/{tool => tools}/builtin/compress.go (99%) rename internal/{tool => tools}/builtin/computer.go (98%) rename internal/{tool => tools}/builtin/computer_test.go (96%) rename internal/{tool => tools}/builtin/confine.go (98%) rename internal/{tool => tools}/builtin/confine_test.go (99%) rename internal/{tool => tools}/builtin/contextbudget.go (97%) rename internal/{tool => tools}/builtin/contextual_visibility_test.go (93%) rename internal/{tool => tools}/builtin/criterion_citation_test.go (97%) rename internal/{tool => tools}/builtin/crlf_edit_test.go (98%) rename internal/{tool => tools}/builtin/delete_range.go (99%) rename internal/{tool => tools}/builtin/delete_range_samedge_test.go (96%) rename internal/{tool => tools}/builtin/delete_range_test.go (99%) rename internal/{tool => tools}/builtin/delete_symbol.go (98%) rename internal/{tool => tools}/builtin/delete_symbol_doc_test.go (98%) rename internal/{tool => tools}/builtin/delete_symbol_test.go (99%) rename internal/{tool => tools}/builtin/e2e_encoding_test.go (98%) rename internal/{tool => tools}/builtin/editfile.go (97%) rename internal/{tool => tools}/builtin/editsource.go (97%) rename internal/{tool => tools}/builtin/editsource_test.go (99%) rename internal/{tool => tools}/builtin/encoding_helpers.go (99%) rename internal/{tool => tools}/builtin/fuzzy_edit_test.go (99%) rename internal/{tool => tools}/builtin/gitignore.go (98%) rename internal/{tool => tools}/builtin/gitignore_e2e_test.go (99%) rename internal/{tool => tools}/builtin/gitignore_test.go (98%) rename internal/{tool => tools}/builtin/glob.go (98%) rename internal/{tool => tools}/builtin/glob_root_test.go (100%) rename internal/{tool => tools}/builtin/grep.go (98%) rename internal/{tool => tools}/builtin/grep_cjk_peek_test.go (100%) rename internal/{tool => tools}/builtin/grep_engine_test.go (98%) rename internal/{tool => tools}/builtin/grep_glob_test.go (99%) rename internal/{tool => tools}/builtin/grep_ignored_test.go (100%) rename internal/{tool => tools}/builtin/host_subject.go (100%) rename internal/{tool => tools}/builtin/host_subject_test.go (98%) rename internal/{tool => tools}/builtin/image_read_test.go (96%) rename internal/{tool => tools}/builtin/ls.go (99%) rename internal/{tool => tools}/builtin/main_test.go (100%) rename internal/{tool => tools}/builtin/managed_config.go (98%) rename internal/{tool => tools}/builtin/movefile.go (98%) rename internal/{tool => tools}/builtin/movefile_other.go (100%) rename internal/{tool => tools}/builtin/movefile_windows.go (100%) rename internal/{tool => tools}/builtin/movefile_windows_test.go (100%) rename internal/{tool => tools}/builtin/multiedit.go (98%) rename internal/{tool => tools}/builtin/notebookedit.go (99%) rename internal/{tool => tools}/builtin/notebookedit_test.go (99%) rename internal/{tool => tools}/builtin/pathwriter_test.go (98%) rename internal/{tool => tools}/builtin/pipe_status.go (96%) rename internal/{tool => tools}/builtin/pipe_status_test.go (99%) rename internal/{tool => tools}/builtin/post_write_receipt.go (100%) rename internal/{tool => tools}/builtin/post_write_receipt_test.go (100%) rename internal/{tool => tools}/builtin/preview.go (99%) rename internal/{tool => tools}/builtin/preview_test.go (98%) rename internal/{tool => tools}/builtin/protected_dirs_darwin.go (100%) rename internal/{tool => tools}/builtin/protected_dirs_darwin_test.go (100%) rename internal/{tool => tools}/builtin/protected_dirs_other.go (100%) rename internal/{tool => tools}/builtin/readfile.go (99%) rename internal/{tool => tools}/builtin/readfile_stream_test.go (98%) rename internal/{tool => tools}/builtin/readfile_utf16_test.go (97%) rename internal/{tool => tools}/builtin/readfile_window_test.go (100%) rename internal/{tool => tools}/builtin/recall.go (99%) rename internal/{tool => tools}/builtin/receipt_hint_test.go (100%) rename internal/{tool => tools}/builtin/recursive_search_test.go (98%) rename internal/{tool => tools}/builtin/schema_budget.json (100%) rename internal/{tool => tools}/builtin/schema_budget_test.go (96%) rename internal/{tool => tools}/builtin/sequential_test.go (98%) rename internal/{tool => tools}/builtin/session_guard.go (100%) rename internal/{tool => tools}/builtin/session_guard_test.go (99%) rename internal/{tool => tools}/builtin/sessiontemp_error.go (100%) rename internal/{tool => tools}/builtin/step_identity_test.go (99%) rename internal/{tool => tools}/builtin/systemone.go (97%) rename internal/{tool => tools}/builtin/systemone_test.go (99%) rename internal/{tool => tools}/builtin/terminal_result_test.go (98%) rename internal/{tool => tools}/builtin/timeout.go (100%) rename internal/{tool => tools}/builtin/todo.go (99%) rename internal/{tool => tools}/builtin/todo_test.go (99%) rename internal/{tool => tools}/builtin/tool_extra_test.go (99%) rename internal/{tool => tools}/builtin/updategoal.go (99%) rename internal/{tool => tools}/builtin/updategoal_test.go (99%) rename internal/{tool => tools}/builtin/vendorskip_test.go (97%) rename internal/{tool => tools}/builtin/walk_cancel_test.go (98%) rename internal/{tool => tools}/builtin/web_fetch_proxy_test.go (99%) rename internal/{tool => tools}/builtin/webfetch.go (99%) rename internal/{tool => tools}/builtin/webfetch_ssrf_test.go (100%) rename internal/{tool => tools}/builtin/workspace.go (98%) rename internal/{tool => tools}/builtin/workspace_test.go (99%) rename internal/{tool => tools}/builtin/write_tool_test.go (99%) rename internal/{tool => tools}/builtin/writefile.go (97%) rename internal/{ => tools}/productdocs/docs.go (99%) rename internal/{ => tools}/productdocs/docs_test.go (99%) rename internal/{ => tools}/productdocs/metadata.go (100%) rename internal/{tool => tools}/sessiontool/sessiontool.go (98%) rename internal/{tool => tools}/sessiontool/sessiontool_test.go (99%) rename internal/{ => tools}/shellrun/decode.go (94%) rename internal/{ => tools}/shellrun/decode_test.go (100%) rename internal/{ => tools}/shellrun/descriptor.go (96%) rename internal/{ => tools}/shellrun/progress_suppress_test.go (100%) rename internal/{ => tools}/shellrun/runner.go (99%) rename internal/{ => tools}/shellrun/runner_test.go (99%) rename internal/{ => tools}/shellrun/subject.go (97%) rename internal/{ => tools}/shellrun/subject_test.go (94%) create mode 100644 tools/repolint/layer_order.go create mode 100644 tools/repolint/layer_order_test.go diff --git a/.github/labeler.yml b/.github/labeler.yml index 9a4a2d63a5..3ad9379890 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -6,36 +6,36 @@ agent: - changed-files: - any-glob-to-any-file: - - 'internal/agent/**' - - 'internal/control/**' + - 'internal/runtime/agent/**' + - 'internal/session/control/**' mcp: - changed-files: - any-glob-to-any-file: - - 'internal/plugin/**' + - 'internal/ext/plugin/**' - 'internal/codegraph/**' config: - changed-files: - any-glob-to-any-file: - - 'internal/config/**' - - 'internal/boot/**' + - 'internal/contract/config/**' + - 'internal/assembly/boot/**' provider: - changed-files: - any-glob-to-any-file: - - 'internal/provider/**' + - 'internal/contract/provider/**' skills: - changed-files: - any-glob-to-any-file: - - 'internal/skill/**' - - 'internal/tool/**' + - 'internal/ext/skill/**' + - 'internal/contract/tool/**' tui: - changed-files: - any-glob-to-any-file: - - 'internal/cli/**' + - 'internal/frontend/cli/**' desktop: - changed-files: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a832f8db8c..0f596f6d64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,9 +57,9 @@ jobs: # so only this clearly-unrelated set is safe to skip. if echo "$files" | grep -qvE '^(docs/|release-notes/|workers/|benchmarks/|npm/|[^/]+\.md$)'; then desktop=true; fi # sdk/go is a nested module invisible to root `go test ./...`; - # its DTOs are generated from internal/extension/protocol, so + # its DTOs are generated from internal/ext/extension/protocol, so # both paths must trigger the sdk job. - if echo "$files" | grep -qE '^(sdk/|internal/extension/)'; then sdk=true; fi + if echo "$files" | grep -qE '^(sdk/|internal/ext/extension/)'; then sdk=true; fi fi fi { echo "code=$code"; echo "desktop=$desktop"; echo "sdk=$sdk"; } >> "$GITHUB_OUTPUT" @@ -158,8 +158,8 @@ jobs: # remains independently bounded by Go's per-package timeout below. # # That timeout is 8m, not 3m: across four consecutive runs of the same - # code, internal/boot measured 133s, 146s, 162s and then hit 180s, and - # internal/agent 82s, 92s, 144s and 180s — a 2.2x spread from runner + # code, internal/assembly/boot measured 133s, 146s, 162s and then hit 180s, and + # internal/runtime/agent 82s, 92s, 144s and 180s — a 2.2x spread from runner # variance alone, with four heavy packages sharing four vCPUs. At 3m the # step failed on slow runners without a code change; a hang still trips # the 15 minute job budget above. @@ -169,24 +169,24 @@ jobs: env: REASONIX_RELEASE_CACHE_GUARD: "1" WINDOWS_SANDBOX_WAIT_MS: "20000" - run: go test -p 4 -timeout=8m ./internal/agent/... ./internal/appidentity/... ./internal/boot/... ./internal/checkpoint/... ./internal/cli/... ./internal/control/... ./internal/filelock/... ./internal/fileutil/... ./internal/hook/... ./internal/instruction/... ./internal/mcplaunch/... ./internal/notify/... ./internal/proc/... ./internal/remote/... ./internal/repair/... ./internal/sandbox/... ./internal/sysproxy/... ./internal/workspacelease/... ./cmd/... + run: go test -p 4 -timeout=8m ./internal/runtime/agent/... ./internal/platform/appidentity/... ./internal/assembly/boot/... ./internal/state/checkpoint/... ./internal/frontend/cli/... ./internal/session/control/... ./internal/base/filelock/... ./internal/base/fileutil/... ./internal/ext/hook/... ./internal/state/instruction/... ./internal/ext/mcplaunch/... ./internal/platform/notify/... ./internal/base/proc/... ./internal/platform/remote/... ./internal/platform/repair/... ./internal/safety/sandbox/... ./internal/base/sysproxy/... ./internal/state/workspacelease/... ./cmd/... - # The general Windows PR smoke list intentionally omits internal/tool. + # The general Windows PR smoke list intentionally omits internal/contract/tool. # Keep the session-temp portability contract covered without widening the # leg to every tool test: two real PowerShell launches must share the # injected TMPDIR/TMP/TEMP directory. - name: test (Windows session temp) if: env.RUN_STEPS == 'true' && runner.os == 'Windows' && github.event_name == 'pull_request' timeout-minutes: 3 - run: go test -timeout=2m -run '^TestBashSharesSessionTempAcrossCalls$' ./internal/tool/builtin + run: go test -timeout=2m -run '^TestBashSharesSessionTempAcrossCalls$' ./internal/tools/builtin # Shell execution contract: PowerShell identity, Chinese workspace paths, # UTF-8 output, and ExitCode retention must gate PRs on native Windows. - # Keep this focused (not full ./internal/tool) so the smoke budget holds. + # Keep this focused (not full ./internal/contract/tool) so the smoke budget holds. - name: test (Windows shell execution contract) if: env.RUN_STEPS == 'true' && runner.os == 'Windows' && github.event_name == 'pull_request' timeout-minutes: 5 - run: go test -timeout=3m -run '^TestBashPowerShellExecuteDetailedContract$|^TestBashPowerShell51PreflightRejectsAndAndDetailed$|^TestBashPowerShellOutputIsUTF8$|^TestBashPowerShellSurfacesNonZeroExit$|^TestBashPowerShellRejectsChaining$' ./internal/tool/builtin + run: go test -timeout=3m -run '^TestBashPowerShellExecuteDetailedContract$|^TestBashPowerShell51PreflightRejectsAndAndDetailed$|^TestBashPowerShellOutputIsUTF8$|^TestBashPowerShellSurfacesNonZeroExit$|^TestBashPowerShellRejectsChaining$' ./internal/tools/builtin # Full push suite still uses the same 8m package budget as Windows smoke: # agent/boot/control already hit 180s package timeouts under runner load, @@ -242,7 +242,7 @@ jobs: if: github.event_name == 'pull_request' env: REASONIX_RELEASE_CACHE_GUARD: "1" - run: go test -race ./internal/agent/... ./internal/plugin/... ./internal/jobs/... ./internal/proc/... ./internal/sandbox/... ./internal/filelock/... ./internal/eventwire/... ./internal/remote/... ./internal/extension/... ./internal/boot/... ./internal/control/... ./internal/tool/... + run: go test -race ./internal/runtime/agent/... ./internal/ext/plugin/... ./internal/runtime/jobs/... ./internal/base/proc/... ./internal/safety/sandbox/... ./internal/base/filelock/... ./internal/contract/eventwire/... ./internal/platform/remote/... ./internal/ext/extension/... ./internal/assembly/boot/... ./internal/session/control/... ./internal/contract/tool/... - name: test -race (full) if: github.event_name != 'pull_request' @@ -251,7 +251,7 @@ jobs: run: go test -race ./... # sdk/go is a nested stdlib-only module invisible to root `go test ./...`. - # Its DTOs are generated from internal/extension/protocol, and the + # Its DTOs are generated from internal/ext/extension/protocol, and the # host-side conformance tests spawn the SDK example, so the job runs the # same three-OS matrix as the root tests. sdk: diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 94baf9b107..25ba4a905d 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -16,7 +16,7 @@ builds: ldflags: # Inject version identity for `reasonix version --verbose/--json` (Integration D/E). # buildTimeUTC is the goreleaser run time (UTC), not vcs.time. - - -s -w -X main.version={{ .Tag }} -X main.gitCommit={{ .ShortCommit }} -X main.buildTimeUTC={{ .Date }} -X reasonix/internal/productdocs.linkedVersion={{ .Tag }} -X reasonix/internal/productdocs.linkedRevision={{ .Commit }} + - -s -w -X main.version={{ .Tag }} -X main.gitCommit={{ .ShortCommit }} -X main.buildTimeUTC={{ .Date }} -X reasonix/internal/tools/productdocs.linkedVersion={{ .Tag }} -X reasonix/internal/tools/productdocs.linkedRevision={{ .Commit }} goos: [darwin, linux, windows] goarch: [amd64, arm64] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8b7ff5493b..25bccf9b33 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,21 +24,21 @@ go test ./... # runs the full test suite | Directory | Purpose | |-----------|---------| | `cmd/reasonix` | CLI entry point | -| `internal/agent` | Agent loop, session, coordinator | -| `internal/cli` | TUI, subcommands, setup wizard | -| `internal/control` | Transport-agnostic controller | -| `internal/config` | TOML configuration loading | -| `internal/tool/builtin` | Built-in tools (bash, read_file, …) | -| `internal/provider` | Model-backend abstraction | -| `internal/provider/openai` | OpenAI-compatible provider | -| `internal/plugin` | MCP client (stdio + HTTP) | -| `internal/event` | Typed event stream | -| `internal/hook` | Shell hooks (PreToolUse, …) | -| `internal/memory` | REASONIX.md hierarchy + auto-memory | -| `internal/skill` | Skill discovery from Markdown | -| `internal/sandbox` | OS-level sandboxing | -| `internal/serve` | HTTP/SSE server frontend | -| `internal/checkpoint` | Snapshot-based rewind | +| `internal/runtime/agent` | Agent loop, session, coordinator | +| `internal/frontend/cli` | TUI, subcommands, setup wizard | +| `internal/session/control` | Transport-agnostic controller | +| `internal/contract/config` | TOML configuration loading | +| `internal/tools/builtin` | Built-in tools (bash, read_file, …) | +| `internal/contract/provider` | Model-backend abstraction | +| `internal/model/openai` | OpenAI-compatible provider | +| `internal/ext/plugin` | MCP client (stdio + HTTP) | +| `internal/contract/event` | Typed event stream | +| `internal/ext/hook` | Shell hooks (PreToolUse, …) | +| `internal/state/memory` | REASONIX.md hierarchy + auto-memory | +| `internal/ext/skill` | Skill discovery from Markdown | +| `internal/safety/sandbox` | OS-level sandboxing | +| `internal/frontend/serve` | HTTP/SSE server frontend | +| `internal/state/checkpoint` | Snapshot-based rewind | | `desktop/` | Studio: the Electron shell, the SPA it serves (separate Go module) | | `docs/` | Engineering spec, migration guide | @@ -113,8 +113,8 @@ For these changes: ```bash go test ./... # all tests -go test ./internal/agent/ -v # verbose, one package -go test ./internal/tool/builtin/ -run TestGrep # one test +go test ./internal/runtime/agent/ -v # verbose, one package +go test ./internal/tools/builtin/ -run TestGrep # one test ``` ### Code style @@ -139,25 +139,25 @@ ci: add golangci-lint and govulncheck ## Adding a new built-in tool -1. Create `internal/tool/builtin/mytool.go` +1. Create `internal/tools/builtin/mytool.go` 2. Implement the `tool.Tool` interface: `Name()`, `Description()`, `Schema()`, `ReadOnly()`, `Execute()` 3. Register via `func init() { tool.RegisterBuiltin(myTool{}) }` -4. Add tests in `internal/tool/builtin/builtin_test.go` or a separate `mytool_test.go` +4. Add tests in `internal/tools/builtin/builtin_test.go` or a separate `mytool_test.go` 5. The tool is automatically available — `main` blank-imports `builtin` ## Adding a new model provider -(For MCP tool servers see `internal/plugin` instead — that's a different layer.) +(For MCP tool servers see `internal/ext/plugin` instead — that's a different layer.) -1. Create `internal/provider/myprovider/` +1. Create `internal/contract/provider/myprovider/` 2. Implement `provider.Provider`: `Name()`, `Stream()` 3. Register via `func init() { provider.Register("mykind", New) }` 4. The provider is available from config with `kind = "mykind"` ## Adding i18n strings -1. Add the field to `internal/i18n/i18n.go` (`Messages` struct) -2. Add the value in `internal/i18n/messages_en.go` and `messages_zh.go` +1. Add the field to `internal/base/i18n/i18n.go` (`Messages` struct) +2. Add the value in `internal/base/i18n/messages_en.go` and `messages_zh.go` 3. The `TestCatalogsComplete` test will fail if you miss a locale ## Submitting changes diff --git a/REASONIX.md b/REASONIX.md index 7c8d80136b..a7f0106f9b 100644 --- a/REASONIX.md +++ b/REASONIX.md @@ -21,13 +21,13 @@ agent. It is the Reasonix analog of Claude Code's CLAUDE.md. thinks, `TaskSpec` what this call wants, `CapabilityGrant` what it may touch, `ContextRequest` what it starts from, `SchedulerPolicy` when it runs. Put a field in whichever member decides its value — profiles carry ceilings, never - per-call values. `internal/agent/profile_boundary_test.go` enforces it. + per-call values. `internal/runtime/agent/profile_boundary_test.go` enforces it. - Cache-first: the system-prompt prefix (base prompt, tools, declared prefix configuration) must stay byte-stable across turns so DeepSeek's automatic prefix cache stays warm. Never mutate it mid-session — ride the turn tail instead (see `control.Compose`), under the rules in *Context projection*. - Performance features land with an effect test at their final boundary - (`internal/boot/effect_test.go` pattern): assert what actually reaches the + (`internal/assembly/boot/effect_test.go` pattern): assert what actually reaches the provider request, frontend sink, or trajectory through the real `boot.Build` assembly. Component correctness is not system effectiveness. - A mutex- or atomic-guarded struct is ratcheted on its **scalar** field count @@ -48,7 +48,7 @@ agent. It is the Reasonix analog of Claude Code's CLAUDE.md. knows a deadline expired rather than a socket closed, and a message is where that knowledge goes to die: the reader is left matching words, or with nothing. Across HTTP the identity is a dotted code through `refuse`; - `refusal-path` fails a new `http.Error` in `internal/serve`, and the parity + `refusal-path` fails a new `http.Error` in `internal/frontend/serve`, and the parity test fails a code the frontend cannot say. Inside Go it is `errors.Is` on a sentinel the wrapping preserves; `error-text` fails a new match against an error message, following it one hop into a local because storing the text @@ -196,7 +196,7 @@ prefix was never where these belonged wrongly; freshness ownership was missing. canonical state, so a switch flipped and a file edited past every API are the same question, and a change no projection renders is not a change. -`internal/boot/context_projection_test.go` holds all five at the provider +`internal/assembly/boot/context_projection_test.go` holds all five at the provider boundary, with the skills listing and the standing instructions as the two worked examples. A block is settled only once the turn carrying it reaches the runner: a turn blocked by a hook or refused by an extension after composing put @@ -231,7 +231,7 @@ file only if all of them land, so a failure midway leaves nothing half-edited. ## Vendor rates Official list prices live in one place: `officialRates` in -`internal/billing/rates.go`, oldest generation first, the last being what a +`internal/model/billing/rates.go`, oldest generation first, the last being what a model charges today. A price change is an **append, never an edit** — the superseded rate is what lets an installed config be recognised as holding one of ours and brought forward, instead of quoting a retired rate for the rest of @@ -248,7 +248,7 @@ exits non-zero — unread is its own verdict and never counts as agreement. ## Curated presets A preset changing shape reaches the installs that already have the old one -through `shippedPresets` in `internal/config/preset_upgrade.go`: one declared +through `shippedPresets` in `internal/contract/config/preset_upgrade.go`: one declared shape per generation, and one upgrade that brings a matching entry forward. The guard is the whole shape — catalog, window, default — because an entry holding what we shipped is ours to move and anything else its user curated. @@ -274,7 +274,7 @@ Run these **before every commit** to catch the fastest CI failures locally: gofmt -w . # catches gofmt (saves ~13s CI) go vet ./... # catches vet warnings (saves ~52s CI/lint) make lint # golangci-lint at CI's pin + repolint -go test ./internal/tool/builtin/ ./internal/boot/ # catches tool/boot test breaks +go test ./internal/tools/builtin/ ./internal/assembly/boot/ # catches tool/boot test breaks ``` `make lint` runs both gates CI runs, at the version in `.golangci-version`; @@ -326,21 +326,21 @@ can finish. Sensitivity is declared, never inferred: the host does not read it out of how a path is spelled, which cannot tell `internal/auth` from `session_write_authority.go`, or a trace file from a data race. -- sensitive: internal/permission/** -- sensitive: internal/sandbox/** -- sensitive: internal/shellsafe/** -- sensitive: internal/shellparse/** -- sensitive: internal/control/approval.go -- sensitive: internal/control/approval_bridge.go -- sensitive: internal/control/approval_orchestration.go -- sensitive: internal/providerbroker/** -- sensitive: internal/installsource/** -- sensitive: internal/plugin/** -- sensitive: internal/pluginpkg/** -- sensitive: internal/netclient/** -- sensitive: internal/redirectguard/** -- sensitive: internal/browser/** -- sensitive: internal/computer/** +- sensitive: internal/safety/permission/** +- sensitive: internal/safety/sandbox/** +- sensitive: internal/safety/shellsafe/** +- sensitive: internal/base/shellparse/** +- sensitive: internal/session/control/approval.go +- sensitive: internal/session/control/approval_bridge.go +- sensitive: internal/session/control/approval_orchestration.go +- sensitive: internal/model/providerbroker/** +- sensitive: internal/ext/installsource/** +- sensitive: internal/ext/plugin/** +- sensitive: internal/ext/pluginpkg/** +- sensitive: internal/base/netclient/** +- sensitive: internal/safety/redirectguard/** +- sensitive: internal/platform/browser/** +- sensitive: internal/platform/computer/** One declaration, two effects: the same list is also the coverage gate's subject. `make coverage-gate` holds each path to the coverage it already has, because @@ -376,7 +376,7 @@ moving a number here must not move the promise. establishes nothing and the mutation stays unproven. - Symlinks are recorded by `Lstat`, so a write through one lands outside what the walk compares. Confining the resolved target is the sandbox's job. -- `internal/sandbox` confines writes to the workspace, configured extras, temp +- `internal/safety/sandbox` confines writes to the workspace, configured extras, temp and toolchain caches — on macOS and Linux. Windows has no OS-level bash sandbox, so there nothing the host enforces bounds `Writable`. - The governed host authorities are a *named* set — ssh-agent, docker, podman. diff --git a/benchmarks/catalog-detector/detector.go b/benchmarks/catalog-detector/detector.go index eabbd90588..025ba2752c 100644 --- a/benchmarks/catalog-detector/detector.go +++ b/benchmarks/catalog-detector/detector.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - "reasonix/internal/skill" + "reasonix/internal/ext/skill" ) // detector answers one question: has the thing the model would be sent changed? diff --git a/benchmarks/catalog-detector/verdict.go b/benchmarks/catalog-detector/verdict.go index ace43bd710..84dd6a1479 100644 --- a/benchmarks/catalog-detector/verdict.go +++ b/benchmarks/catalog-detector/verdict.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/skill" + "reasonix/internal/ext/skill" ) type verdict struct { diff --git a/benchmarks/compaction/main.go b/benchmarks/compaction/main.go index 3646e631eb..b0283ce042 100644 --- a/benchmarks/compaction/main.go +++ b/benchmarks/compaction/main.go @@ -18,13 +18,13 @@ import ( "strings" "time" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - _ "reasonix/internal/provider/openai" - "reasonix/internal/tokencount" - "reasonix/internal/tool" + "reasonix/internal/base/tokencount" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + _ "reasonix/internal/model/openai" + "reasonix/internal/runtime/agent" ) const ( diff --git a/benchmarks/compaction/probes.go b/benchmarks/compaction/probes.go index f6a5ea85c4..0796edfc98 100644 --- a/benchmarks/compaction/probes.go +++ b/benchmarks/compaction/probes.go @@ -6,9 +6,9 @@ import ( "strings" "unicode" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // probeAnswerContract rides with every probe question. A context full of tool @@ -240,8 +240,8 @@ func revisionProbes() []probe { { class: "late-constraint", plantAt: 3, - plant: userTurn("New hard rule from here on: never edit anything under internal/store/."), - question: "Are you allowed to edit files under internal/store/? Answer yes or no.", + plant: userTurn("New hard rule from here on: never edit anything under internal/state/store/."), + question: "Are you allowed to edit files under internal/state/store/? Answer yes or no.", want: []string{"no"}, reject: []string{"yes"}, }, diff --git a/benchmarks/compaction/session.go b/benchmarks/compaction/session.go index 627c355ecf..172e6512e5 100644 --- a/benchmarks/compaction/session.go +++ b/benchmarks/compaction/session.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // A generation is one round of work followed by one compaction. Compaction diff --git a/benchmarks/context-maintenance-e2e/main.go b/benchmarks/context-maintenance-e2e/main.go index 40af557abd..dfee990a46 100644 --- a/benchmarks/context-maintenance-e2e/main.go +++ b/benchmarks/context-maintenance-e2e/main.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - _ "reasonix/internal/provider/openai" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + _ "reasonix/internal/model/openai" + "reasonix/internal/runtime/agent" ) const ( diff --git a/benchmarks/context-retrieval/capture.go b/benchmarks/context-retrieval/capture.go index f1bbd9ea6e..6a3f7e004a 100644 --- a/benchmarks/context-retrieval/capture.go +++ b/benchmarks/context-retrieval/capture.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/boot" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" - _ "reasonix/internal/tool/builtin" + "reasonix/internal/assembly/boot" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + _ "reasonix/internal/tools/builtin" ) // A projection is what the agent believes; a provider.Request is what the model diff --git a/benchmarks/context-retrieval/contextbench.go b/benchmarks/context-retrieval/contextbench.go index 4d4faf1d3e..aeb0026c70 100644 --- a/benchmarks/context-retrieval/contextbench.go +++ b/benchmarks/context-retrieval/contextbench.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "reasonix/internal/provider" - "reasonix/internal/tokencount" + "reasonix/internal/base/tokencount" + "reasonix/internal/contract/provider" ) // Every judgement here reads a tool call's name and its JSON arguments, or a diff --git a/benchmarks/context-retrieval/contextbench_test.go b/benchmarks/context-retrieval/contextbench_test.go index e79aa20bc9..853ff2cc58 100644 --- a/benchmarks/context-retrieval/contextbench_test.go +++ b/benchmarks/context-retrieval/contextbench_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // The scorer decides what the pilot concludes, so it is held to the same rule diff --git a/benchmarks/context-retrieval/corpus.go b/benchmarks/context-retrieval/corpus.go index 36ea73fbe2..787dadb257 100644 --- a/benchmarks/context-retrieval/corpus.go +++ b/benchmarks/context-retrieval/corpus.go @@ -4,8 +4,8 @@ import ( "fmt" "math/rand" - "reasonix/internal/agent" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // Synthetic history on purpose: an answer that exists in the workspace is diff --git a/benchmarks/context-retrieval/fixture.go b/benchmarks/context-retrieval/fixture.go index f50416894d..302a929ae4 100644 --- a/benchmarks/context-retrieval/fixture.go +++ b/benchmarks/context-retrieval/fixture.go @@ -8,11 +8,11 @@ import ( "path/filepath" "strings" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // A fixture is a real session that has really been compacted: no bench-only diff --git a/benchmarks/context-retrieval/preflight.go b/benchmarks/context-retrieval/preflight.go index 82b17e6da4..33ef4b7874 100644 --- a/benchmarks/context-retrieval/preflight.go +++ b/benchmarks/context-retrieval/preflight.go @@ -7,9 +7,9 @@ import ( "slices" "strings" - "reasonix/internal/ablation" - "reasonix/internal/provider" - "reasonix/internal/retrieval" + "reasonix/internal/base/retrieval" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/provider" ) // Preflight is what makes a real run worth paying for. An answer the model can diff --git a/benchmarks/context-retrieval/reformulation.go b/benchmarks/context-retrieval/reformulation.go index 61d3a061f2..03405b7b81 100644 --- a/benchmarks/context-retrieval/reformulation.go +++ b/benchmarks/context-retrieval/reformulation.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "reasonix/internal/retrieval" + "reasonix/internal/base/retrieval" ) // The host probe ranks every target first, so the engine is not what makes a diff --git a/benchmarks/context-retrieval/run.go b/benchmarks/context-retrieval/run.go index 86bb0b48a3..1a76da2f64 100644 --- a/benchmarks/context-retrieval/run.go +++ b/benchmarks/context-retrieval/run.go @@ -11,14 +11,14 @@ import ( "strings" "time" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/boot" - "reasonix/internal/event" - "reasonix/internal/provider" - _ "reasonix/internal/provider/openai" - "reasonix/internal/tool" - _ "reasonix/internal/tool/builtin" + "reasonix/internal/assembly/boot" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + _ "reasonix/internal/model/openai" + "reasonix/internal/runtime/agent" + _ "reasonix/internal/tools/builtin" ) // A run is one recall question against a fixture the preflight has already diff --git a/benchmarks/context-retrieval/scripted.go b/benchmarks/context-retrieval/scripted.go index de1baf2bf5..32772e5f10 100644 --- a/benchmarks/context-retrieval/scripted.go +++ b/benchmarks/context-retrieval/scripted.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // scriptedProvider walks the chain a competent model would: search, read the diff --git a/benchmarks/context-retrieval/snippet.go b/benchmarks/context-retrieval/snippet.go index 7006d8e2c7..eec069db7b 100644 --- a/benchmarks/context-retrieval/snippet.go +++ b/benchmarks/context-retrieval/snippet.go @@ -8,11 +8,11 @@ import ( "path/filepath" "strings" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/retrieval" - "reasonix/internal/tool" + "reasonix/internal/base/retrieval" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // TargetHit is not EvidenceSufficient: a rank-1 hit can still hand over a diff --git a/benchmarks/project-check/README.md b/benchmarks/project-check/README.md index 8523356aec..7411d27698 100644 --- a/benchmarks/project-check/README.md +++ b/benchmarks/project-check/README.md @@ -11,7 +11,7 @@ to this gate and no amount of running it accumulates evidence about it. Two different claims need two different kinds of evidence. That the legacy derivation can be bypassed is already proven deterministically -by `internal/agent/project_check_probe_test.go`: a delivery turn that rewrites +by `internal/runtime/agent/project_check_probe_test.go`: a delivery turn that rewrites its own `- verify:` line and runs only the replacement finalizes, never having run the criterion the task began under. That test needs no corpus. @@ -76,7 +76,7 @@ So the chain this corpus set out to pin breaks at its first link. The restored baseline was not A, and every claim after that fails with it. One path is left and is not tested here. `DeliveryCheckpoint` carries -`BaselineChecks` and is persisted with goal state (`internal/control/goal.go`, +`BaselineChecks` and is persisted with goal state (`internal/session/control/goal.go`, json-tagged); `RestoreDeliveryCheckpoint` seeds a rebuilt executor, and the turn loop only clears the checkpoint when the scope id changes. A Goal that survives a restart across a changed declaration would therefore keep the old baseline diff --git a/benchmarks/runtime-resume/README.md b/benchmarks/runtime-resume/README.md index ba82010a94..01d6bf08bc 100644 --- a/benchmarks/runtime-resume/README.md +++ b/benchmarks/runtime-resume/README.md @@ -137,7 +137,7 @@ it, and its parent call stays empty. `SubagentMeta` carries both answers, and this is the first place they differ — until a host-started run existed, every durable execution came from a tool call and one field could hold both. -`TestDelegationClassesStayApart` in `internal/boot` holds the classification, and +`TestDelegationClassesStayApart` in `internal/assembly/boot` holds the classification, and holds it where a completed run cannot: what the store answers at the one instant a child is inside the provider. A check made afterwards cannot tell a recorded execution from an unrecorded one that happened to finish, because completion @@ -1105,7 +1105,7 @@ released. ## Rebuilding the graph -`internal/execgraph` folds the journal, the store's child terminals, and this +`internal/state/execgraph` folds the journal, the store's child terminals, and this process's live executions into a graph. It recomputes rather than restores: nothing reads a file or emits an event, and the same inputs always give the same picture. diff --git a/benchmarks/runtime-resume/activestore.go b/benchmarks/runtime-resume/activestore.go index 458eb339f7..f767eaf32d 100644 --- a/benchmarks/runtime-resume/activestore.go +++ b/benchmarks/runtime-resume/activestore.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/control" - "reasonix/internal/execjournal" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/session/control" + "reasonix/internal/state/execjournal" ) // armFleetActiveStore asks whether the sub-agent store can be asked about a diff --git a/benchmarks/runtime-resume/arms.go b/benchmarks/runtime-resume/arms.go index ce72a21e47..84b372457d 100644 --- a/benchmarks/runtime-resume/arms.go +++ b/benchmarks/runtime-resume/arms.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/memory" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/memory" ) // arm is one death-and-resume run. Lever runs between the two processes and is diff --git a/benchmarks/runtime-resume/cancelrouting.go b/benchmarks/runtime-resume/cancelrouting.go index 42ff9ce6e9..6f6fdbb6c9 100644 --- a/benchmarks/runtime-resume/cancelrouting.go +++ b/benchmarks/runtime-resume/cancelrouting.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "reasonix/internal/control" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) // Where a stop goes — and, first, whose stop it is. A controller owns the turns diff --git a/benchmarks/runtime-resume/derive.go b/benchmarks/runtime-resume/derive.go index d585e23d14..11801bea01 100644 --- a/benchmarks/runtime-resume/derive.go +++ b/benchmarks/runtime-resume/derive.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/agentgraph" - "reasonix/internal/control" - "reasonix/internal/execgraph" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" + "reasonix/internal/state/execgraph" ) // The derivability arms. Everything before them asked what survives; these ask diff --git a/benchmarks/runtime-resume/ephemeral.go b/benchmarks/runtime-resume/ephemeral.go index 5bdd877e9f..688f2605e5 100644 --- a/benchmarks/runtime-resume/ephemeral.go +++ b/benchmarks/runtime-resume/ephemeral.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/control" - "reasonix/internal/provider" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) // The two ephemeral entry points, read against the execution read model's own diff --git a/benchmarks/runtime-resume/fanout.go b/benchmarks/runtime-resume/fanout.go index e6f5c810a8..1cb4973224 100644 --- a/benchmarks/runtime-resume/fanout.go +++ b/benchmarks/runtime-resume/fanout.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/control" - "reasonix/internal/provider" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) // The three fan-out arms. Each dies at a different point in one fleet's life, diff --git a/benchmarks/runtime-resume/graph.go b/benchmarks/runtime-resume/graph.go index 0cdc9bbf0c..c1f9ea9a47 100644 --- a/benchmarks/runtime-resume/graph.go +++ b/benchmarks/runtime-resume/graph.go @@ -6,10 +6,10 @@ import ( "sort" "strings" - "reasonix/internal/agent" - "reasonix/internal/agentgraph" - "reasonix/internal/execgraph" - "reasonix/internal/execjournal" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/execgraph" + "reasonix/internal/state/execjournal" ) // How a run graph can stand after the process that built it exits. Three are diff --git a/benchmarks/runtime-resume/hostexec.go b/benchmarks/runtime-resume/hostexec.go index f79928898e..b7f73ceaff 100644 --- a/benchmarks/runtime-resume/hostexec.go +++ b/benchmarks/runtime-resume/hostexec.go @@ -9,8 +9,8 @@ import ( "sync/atomic" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/control" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/session/control" ) // The interactive host-initiated arms, named for the one surface they measure: a diff --git a/benchmarks/runtime-resume/lineage.go b/benchmarks/runtime-resume/lineage.go index c30c06dfa8..13bfe80fe6 100644 --- a/benchmarks/runtime-resume/lineage.go +++ b/benchmarks/runtime-resume/lineage.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // Two trees, read at once. A stop aimed at a turn must close the turn's own diff --git a/benchmarks/runtime-resume/lonetask.go b/benchmarks/runtime-resume/lonetask.go index 503d5b884f..8f8515fbfc 100644 --- a/benchmarks/runtime-resume/lonetask.go +++ b/benchmarks/runtime-resume/lonetask.go @@ -8,10 +8,10 @@ import ( "slices" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) // The four single-delegation arms. A lone task is not another executor: it diff --git a/benchmarks/runtime-resume/lonetaskrows.go b/benchmarks/runtime-resume/lonetaskrows.go index 5aba76249a..dbccd5e864 100644 --- a/benchmarks/runtime-resume/lonetaskrows.go +++ b/benchmarks/runtime-resume/lonetaskrows.go @@ -5,9 +5,9 @@ import ( "sort" "strings" - "reasonix/internal/agentgraph" - "reasonix/internal/execgraph" - "reasonix/internal/execjournal" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/state/execgraph" + "reasonix/internal/state/execjournal" ) // What a lone delegation leaves behind, layer by layer. The columns are the diff --git a/benchmarks/runtime-resume/observe.go b/benchmarks/runtime-resume/observe.go index 56ec058b9f..b588c9e91d 100644 --- a/benchmarks/runtime-resume/observe.go +++ b/benchmarks/runtime-resume/observe.go @@ -10,13 +10,13 @@ import ( "sort" "strings" - "reasonix/internal/agent" - "reasonix/internal/agentgraph" - "reasonix/internal/control" - "reasonix/internal/evidence" - "reasonix/internal/execjournal" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/session/control" + "reasonix/internal/state/execjournal" + "reasonix/internal/state/store" ) // Observation is everything one phase can read about a session without asking a diff --git a/benchmarks/runtime-resume/phases.go b/benchmarks/runtime-resume/phases.go index dd500b2d18..f3bfaf43b6 100644 --- a/benchmarks/runtime-resume/phases.go +++ b/benchmarks/runtime-resume/phases.go @@ -6,9 +6,9 @@ import ( "os" "time" - "reasonix/internal/agent" - "reasonix/internal/checkpoint" - "reasonix/internal/control" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" + "reasonix/internal/state/checkpoint" ) // probeTurns is enough conversation for a fold to have a region to work on: diff --git a/benchmarks/runtime-resume/runtime.go b/benchmarks/runtime-resume/runtime.go index f61ccaa304..121870e315 100644 --- a/benchmarks/runtime-resume/runtime.go +++ b/benchmarks/runtime-resume/runtime.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/boot" - "reasonix/internal/control" - "reasonix/internal/event" + "reasonix/internal/assembly/boot" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/session/control" ) // armRoot names the four directories one arm owns. Home and Workspace are diff --git a/benchmarks/runtime-resume/schedwait.go b/benchmarks/runtime-resume/schedwait.go index 2afb560e87..d12ab82059 100644 --- a/benchmarks/runtime-resume/schedwait.go +++ b/benchmarks/runtime-resume/schedwait.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/control" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/session/control" ) // The scheduler-wait arms. Each dies with one item ready and refused admission, diff --git a/benchmarks/runtime-resume/scripted.go b/benchmarks/runtime-resume/scripted.go index a430191ff6..8c1c93d8e5 100644 --- a/benchmarks/runtime-resume/scripted.go +++ b/benchmarks/runtime-resume/scripted.go @@ -11,7 +11,7 @@ import ( "sync" "sync/atomic" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // newScripted builds the provider with its synchronisation channels open. The diff --git a/benchmarks/runtime-resume/skillclass.go b/benchmarks/runtime-resume/skillclass.go index 6c57cd9141..03c81c6e14 100644 --- a/benchmarks/runtime-resume/skillclass.go +++ b/benchmarks/runtime-resume/skillclass.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/provider" - "reasonix/internal/skill" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // The skill-runner classification arms. They ask what kind of execution a diff --git a/benchmarks/runtime-resume/terminal.go b/benchmarks/runtime-resume/terminal.go index 6a15b8196c..767a38fb81 100644 --- a/benchmarks/runtime-resume/terminal.go +++ b/benchmarks/runtime-resume/terminal.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/control" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/session/control" ) // The terminal-disposition arms. SETTLED says an opening is no longer active diff --git a/benchmarks/runtime-resume/uigraph.go b/benchmarks/runtime-resume/uigraph.go index 14a16154e1..4426e864dd 100644 --- a/benchmarks/runtime-resume/uigraph.go +++ b/benchmarks/runtime-resume/uigraph.go @@ -12,13 +12,13 @@ import ( "sync" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/execjournal" - "reasonix/internal/provider" - "reasonix/internal/serve" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/frontend/serve" + "reasonix/internal/session/control" + "reasonix/internal/state/execjournal" ) // armUIGraphMixed is the only arm that reads the frontend rather than the host. diff --git a/benchmarks/tool-surface-cache/README.md b/benchmarks/tool-surface-cache/README.md index d550d7ecad..91e2c22549 100644 --- a/benchmarks/tool-surface-cache/README.md +++ b/benchmarks/tool-surface-cache/README.md @@ -35,5 +35,5 @@ across three switches, with no miss spike at either. The absent surface is a byt cache entry serves both. This is what `Registry.ProviderSchemas` is built on: stable tools first, -contextual ones after, each sorted. `internal/tool/provider_surface_test.go` +contextual ones after, each sorted. `internal/contract/tool/provider_surface_test.go` holds the shape — the segment boundary is the property this benchmark priced. diff --git a/cmd/e2ebench/barrier.go b/cmd/e2ebench/barrier.go index 5abb1608d0..811a7f7b24 100644 --- a/cmd/e2ebench/barrier.go +++ b/cmd/e2ebench/barrier.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // The terminal-barrier counterfactual: what a barrier at a child's first diff --git a/cmd/e2ebench/checkpoints_test.go b/cmd/e2ebench/checkpoints_test.go index ce8279ea34..cebfbb1c12 100644 --- a/cmd/e2ebench/checkpoints_test.go +++ b/cmd/e2ebench/checkpoints_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeTaskVerify(t *testing.T, taskDir, script string) { diff --git a/cmd/e2ebench/compare_test.go b/cmd/e2ebench/compare_test.go index 94380c3e1c..c47279659d 100644 --- a/cmd/e2ebench/compare_test.go +++ b/cmd/e2ebench/compare_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeArm(t *testing.T, dir, name string, results []result) string { diff --git a/cmd/e2ebench/corpus_test.go b/cmd/e2ebench/corpus_test.go index 7ff5945ea0..283588ed2d 100644 --- a/cmd/e2ebench/corpus_test.go +++ b/cmd/e2ebench/corpus_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) const corpusDir = "../../benchmarks/e2e" diff --git a/cmd/e2ebench/diff.go b/cmd/e2ebench/diff.go index 5960a4c31a..81f1846a2d 100644 --- a/cmd/e2ebench/diff.go +++ b/cmd/e2ebench/diff.go @@ -11,8 +11,8 @@ import ( "time" "unicode/utf8" - "reasonix/internal/ablation" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" + "reasonix/internal/contract/ablation" ) type diffOpts struct { @@ -423,8 +423,8 @@ func parseCoverProfile(repo, path string) map[string][]coverBlock { return out } -// repoRelFromModulePath turns "reasonix/internal/agent/foo.go" into -// "internal/agent/foo.go" by dropping the first path element (the module root). +// repoRelFromModulePath turns "reasonix/internal/runtime/agent/foo.go" into +// "internal/runtime/agent/foo.go" by dropping the first path element (the module root). func repoRelFromModulePath(p string) string { // Strip the full module prefix; a generic first-segment cut mis-strips a multi-segment module path. prefix := "reasonix/" diff --git a/cmd/e2ebench/diff_test.go b/cmd/e2ebench/diff_test.go index 4fd99456b0..c63e8dfce2 100644 --- a/cmd/e2ebench/diff_test.go +++ b/cmd/e2ebench/diff_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestRunTestsAllowsStaticEnvAssignment(t *testing.T) { diff --git a/cmd/e2ebench/fanout.go b/cmd/e2ebench/fanout.go index b0834183f2..4e8294686c 100644 --- a/cmd/e2ebench/fanout.go +++ b/cmd/e2ebench/fanout.go @@ -6,7 +6,7 @@ import ( "strings" ) -// fanoutMetrics mirrors internal/cli.RunMetrics's field of the same name: what +// fanoutMetrics mirrors internal/frontend/cli.RunMetrics's field of the same name: what // a run's fan-outs cost in wall clock against what the same work costs one at a // time. The agent folds it from the run graph, which is the only record of it. type fanoutMetrics struct { diff --git a/cmd/e2ebench/grader_note_test.go b/cmd/e2ebench/grader_note_test.go index 21adf32ae2..9860945429 100644 --- a/cmd/e2ebench/grader_note_test.go +++ b/cmd/e2ebench/grader_note_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // A failed task is only actionable if the record says what the agent actually diff --git a/cmd/e2ebench/main.go b/cmd/e2ebench/main.go index a056cb6bb5..4fc8f1d2c0 100644 --- a/cmd/e2ebench/main.go +++ b/cmd/e2ebench/main.go @@ -17,10 +17,10 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/ablation" - "reasonix/internal/config" - "reasonix/internal/control" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) type task struct { @@ -55,7 +55,7 @@ type runMetrics struct { CompletionTokens int `json:"completion_tokens"` CacheHitTokens int `json:"cache_hit_tokens"` CacheMissTokens int `json:"cache_miss_tokens"` - // PrefixChangeReasonCounts mirrors internal/cli.RunMetrics's field of the + // PrefixChangeReasonCounts mirrors internal/frontend/cli.RunMetrics's field of the // same name: per-run tallies of why the cache prefix changed (e.g. // "compact_auto", "snip", "tools"), omitempty for older metrics files. PrefixChangeReasonCounts map[string]int `json:"prefix_change_reason_counts,omitempty"` @@ -67,7 +67,7 @@ type runMetrics struct { Currency string `json:"currency"` Compactions int `json:"compactions"` - // Delegation counters mirror internal/cli.RunMetrics. They are what makes a + // Delegation counters mirror internal/frontend/cli.RunMetrics. They are what makes a // single-agent arm comparable against a delegated one for the same model. SubagentRuns int `json:"subagent_runs,omitempty"` SubagentNestedRuns int `json:"subagent_nested_runs,omitempty"` @@ -84,7 +84,7 @@ type runMetrics struct { ParentNamedFiles int `json:"parent_named_files,omitempty"` ChildEvidencePaths int `json:"child_evidence_paths,omitempty"` ChildDiscoveredPaths int `json:"child_discovered_paths,omitempty"` - // Fanout mirrors internal/cli.RunMetrics: fan-out timing folded from the run + // Fanout mirrors internal/frontend/cli.RunMetrics: fan-out timing folded from the run // graph, which is where a scheduling wait is recorded and nowhere else. Fanout *fanoutMetrics `json:"fanout,omitempty"` // Optional Delivery capability counters (omitempty for baseline/old metrics). diff --git a/cmd/e2ebench/mechanisms_test.go b/cmd/e2ebench/mechanisms_test.go index 967bdf3478..597b6abca4 100644 --- a/cmd/e2ebench/mechanisms_test.go +++ b/cmd/e2ebench/mechanisms_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestRenderMechanismLedgerSplitsFiredVsQuiet(t *testing.T) { diff --git a/cmd/e2ebench/memorybench.go b/cmd/e2ebench/memorybench.go index ecf0c72434..b35c05d757 100644 --- a/cmd/e2ebench/memorybench.go +++ b/cmd/e2ebench/memorybench.go @@ -13,7 +13,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // seedTaskMemory populates stateHome's memory store from the task's memory/ diff --git a/cmd/e2ebench/memorybench_test.go b/cmd/e2ebench/memorybench_test.go index d193a8d55f..ddf6566f74 100644 --- a/cmd/e2ebench/memorybench_test.go +++ b/cmd/e2ebench/memorybench_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestScanMemoryRecallCountsAndPointOfUse(t *testing.T) { diff --git a/cmd/e2ebench/meterconfig_test.go b/cmd/e2ebench/meterconfig_test.go index dcecbba6c6..bae9f5fe67 100644 --- a/cmd/e2ebench/meterconfig_test.go +++ b/cmd/e2ebench/meterconfig_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/BurntSushi/toml" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) const twoProviderConfig = ` diff --git a/cmd/e2ebench/metrics_mirror_test.go b/cmd/e2ebench/metrics_mirror_test.go index e9085d19ae..4349eb74eb 100644 --- a/cmd/e2ebench/metrics_mirror_test.go +++ b/cmd/e2ebench/metrics_mirror_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/cli" + "reasonix/internal/frontend/cli" ) // jsonTags collects a struct's JSON field names, descending into embedded and @@ -48,7 +48,7 @@ func TestBenchMetricsOnlyReadTagsTheAgentEmits(t *testing.T) { } if len(orphaned) > 0 { t.Fatalf("e2ebench reads metrics tags no agent writes: %v\n"+ - "either internal/cli.RunMetrics lost them in a rename, or the bench "+ + "either internal/frontend/cli.RunMetrics lost them in a rename, or the bench "+ "invented them; both leave the field zero in every report", orphaned) } } diff --git a/cmd/e2ebench/outcome_test.go b/cmd/e2ebench/outcome_test.go index dcafe270b1..198656ed34 100644 --- a/cmd/e2ebench/outcome_test.go +++ b/cmd/e2ebench/outcome_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeTrajectory(t *testing.T, name string, lines []string) string { diff --git a/cmd/e2ebench/profile.go b/cmd/e2ebench/profile.go index 2493efe5fd..2d89eb5e02 100644 --- a/cmd/e2ebench/profile.go +++ b/cmd/e2ebench/profile.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "reasonix/internal/ablation" + "reasonix/internal/contract/ablation" ) // experimentAxes is the validated set of fixed axes one suite invocation runs diff --git a/cmd/e2ebench/profile_test.go b/cmd/e2ebench/profile_test.go index 9fccf0701b..04bd190552 100644 --- a/cmd/e2ebench/profile_test.go +++ b/cmd/e2ebench/profile_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "reasonix/internal/ablation" + "reasonix/internal/contract/ablation" ) func TestAppendBenchmarkProfileArgsBaselineIsByteIdentical(t *testing.T) { diff --git a/cmd/e2ebench/segmentrun_test.go b/cmd/e2ebench/segmentrun_test.go index d489003261..87c7b5d524 100644 --- a/cmd/e2ebench/segmentrun_test.go +++ b/cmd/e2ebench/segmentrun_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // requireShellStub skips where a #!/usr/bin/env bash stub cannot be executed. diff --git a/cmd/e2ebench/sft_test.go b/cmd/e2ebench/sft_test.go index 3351ba2168..b75a2c83b3 100644 --- a/cmd/e2ebench/sft_test.go +++ b/cmd/e2ebench/sft_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // writeTraj lays down a trajectory whose rounds all report prefix hash "p1". diff --git a/cmd/e2ebench/spend.go b/cmd/e2ebench/spend.go index be61583538..de79000bca 100644 --- a/cmd/e2ebench/spend.go +++ b/cmd/e2ebench/spend.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // conversationSources carry the session's tools and history. Every other diff --git a/cmd/e2ebench/swebench.go b/cmd/e2ebench/swebench.go index a7b1d08f97..bc116cd3a7 100644 --- a/cmd/e2ebench/swebench.go +++ b/cmd/e2ebench/swebench.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "reasonix/internal/ablation" + "reasonix/internal/contract/ablation" ) // SWE-bench mode runs the agent inside the official per-instance evaluation diff --git a/cmd/e2ebench/swebench_run.go b/cmd/e2ebench/swebench_run.go index e261c36d9c..b741651591 100644 --- a/cmd/e2ebench/swebench_run.go +++ b/cmd/e2ebench/swebench_run.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "reasonix/internal/ablation" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/ablation" ) type swebenchOpts struct { diff --git a/cmd/e2ebench/swebench_test.go b/cmd/e2ebench/swebench_test.go index 19fb9f6a59..bed666ff43 100644 --- a/cmd/e2ebench/swebench_test.go +++ b/cmd/e2ebench/swebench_test.go @@ -8,8 +8,8 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/ablation" - "reasonix/internal/config" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/config" ) // The harness prints an unmangled local image key but pulls a mangled one; the diff --git a/cmd/e2ebench/trajectory.go b/cmd/e2ebench/trajectory.go index 3d5262d0b1..533c83c0fb 100644 --- a/cmd/e2ebench/trajectory.go +++ b/cmd/e2ebench/trajectory.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // trajectorySummary is the harness-side digest of one run's trajectory file: diff --git a/cmd/e2ebench/trajectory_test.go b/cmd/e2ebench/trajectory_test.go index f291cfe3b6..16d38825dc 100644 --- a/cmd/e2ebench/trajectory_test.go +++ b/cmd/e2ebench/trajectory_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestSummarizeTrajectoryAttributesTimeAndSkipsTruncatedTail(t *testing.T) { diff --git a/cmd/extension-protocol-gen/main.go b/cmd/extension-protocol-gen/main.go index fc69ec4cd5..6d15bbe04a 100644 --- a/cmd/extension-protocol-gen/main.go +++ b/cmd/extension-protocol-gen/main.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "reasonix/internal/extension/protocolgen" + "reasonix/internal/ext/extension/protocolgen" ) func main() { diff --git a/cmd/reasonix-plugin-example/main.go b/cmd/reasonix-plugin-example/main.go index ac4a597780..8a0fa69415 100644 --- a/cmd/reasonix-plugin-example/main.go +++ b/cmd/reasonix-plugin-example/main.go @@ -1,6 +1,6 @@ // Command reasonix-plugin-example is a reference Reasonix plugin: a minimal MCP stdio // server speaking newline-delimited JSON-RPC 2.0 on stdin/stdout. It exists to -// document the contract end-to-end (the protocol the internal/plugin client +// document the contract end-to-end (the protocol the internal/ext/plugin client // drives) and to give users a working example to copy. // // Wire it up in reasonix.toml: diff --git a/cmd/reasonix-studio-host/main.go b/cmd/reasonix-studio-host/main.go index eb202650b0..8c7cf7f224 100644 --- a/cmd/reasonix-studio-host/main.go +++ b/cmd/reasonix-studio-host/main.go @@ -20,23 +20,23 @@ import ( "strings" "syscall" - "reasonix/internal/appupdate" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/instanceid" - "reasonix/internal/notify" - "reasonix/internal/remotehost" - "reasonix/internal/serve" - "reasonix/internal/surface" - "reasonix/internal/traystate" - "reasonix/internal/update" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/surface" + "reasonix/internal/frontend/remotehost" + "reasonix/internal/frontend/serve" + "reasonix/internal/frontend/traystate" + "reasonix/internal/platform/appupdate" + "reasonix/internal/platform/instanceid" + "reasonix/internal/platform/notify" + "reasonix/internal/platform/update" // Kinds register from init, so a binary builds only what it links. Without // these every Anthropic model answers "unknown kind" at switch time. - _ "reasonix/internal/provider/anthropic" - _ "reasonix/internal/provider/openai" - _ "reasonix/internal/provider/responses" + _ "reasonix/internal/model/anthropic" + _ "reasonix/internal/model/openai" + _ "reasonix/internal/model/responses" ) var version = "dev" diff --git a/cmd/reasonix-studio-host/main_test.go b/cmd/reasonix-studio-host/main_test.go index 9971ca7791..09d216ad0b 100644 --- a/cmd/reasonix-studio-host/main_test.go +++ b/cmd/reasonix-studio-host/main_test.go @@ -13,13 +13,13 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/serve" - "reasonix/internal/surface" - "reasonix/internal/testenv" - "reasonix/internal/traystate" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/surface" + "reasonix/internal/frontend/serve" + "reasonix/internal/frontend/traystate" + "reasonix/internal/session/control" ) func TestMain(m *testing.M) { diff --git a/cmd/reasonix-studio-host/packagegrants.go b/cmd/reasonix-studio-host/packagegrants.go index a7f058ebfe..4f02ac68d2 100644 --- a/cmd/reasonix-studio-host/packagegrants.go +++ b/cmd/reasonix-studio-host/packagegrants.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/packagegrant" + "reasonix/internal/platform/packagegrant" ) // stripPackageGrants works on the directory the application runs from and is diff --git a/cmd/reasonix-studio-host/packagegrants_test.go b/cmd/reasonix-studio-host/packagegrants_test.go index 233a1a5422..11e1465fb8 100644 --- a/cmd/reasonix-studio-host/packagegrants_test.go +++ b/cmd/reasonix-studio-host/packagegrants_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/packagegrant" + "reasonix/internal/platform/packagegrant" ) func TestStripPackageGrantsOnlyAnswersForAnApplication(t *testing.T) { diff --git a/cmd/reasonix-studio-host/wiring_test.go b/cmd/reasonix-studio-host/wiring_test.go index c88178ca4d..fab0ee5fd5 100644 --- a/cmd/reasonix-studio-host/wiring_test.go +++ b/cmd/reasonix-studio-host/wiring_test.go @@ -6,8 +6,8 @@ import ( "go/token" "testing" - "reasonix/internal/config" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" ) // A capability this host implements and does not hand to its hub is one the diff --git a/cmd/reasonix/main.go b/cmd/reasonix/main.go index 14ee0fe5e3..b5aecbea5a 100644 --- a/cmd/reasonix/main.go +++ b/cmd/reasonix/main.go @@ -5,15 +5,15 @@ import ( "os" "runtime/debug" - "reasonix/internal/cli" - "reasonix/internal/config" - "reasonix/internal/crashreport" + "reasonix/internal/contract/config" + "reasonix/internal/frontend/cli" + "reasonix/internal/platform/crashreport" // Blank imports wire compile-time built-ins into their registries. - _ "reasonix/internal/provider/anthropic" - _ "reasonix/internal/provider/openai" - _ "reasonix/internal/provider/responses" - _ "reasonix/internal/tool/builtin" + _ "reasonix/internal/model/anthropic" + _ "reasonix/internal/model/openai" + _ "reasonix/internal/model/responses" + _ "reasonix/internal/tools/builtin" ) // Build identity injected via -ldflags (see Makefile). version remains the diff --git a/cmd/reasonix/main_test.go b/cmd/reasonix/main_test.go index 4c84775a1a..5e3e4779e6 100644 --- a/cmd/reasonix/main_test.go +++ b/cmd/reasonix/main_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/crashreport" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/platform/crashreport" ) func TestRunWithCrashCaptureRecordsAndReraises(t *testing.T) { diff --git a/desktop/README.md b/desktop/README.md index 5e6a435eab..e1c9f54091 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -2,7 +2,7 @@ A desktop window around the Reasonix Go kernel. The window hosts a React SPA, and every request the SPA makes reaches the kernel's own HTTP server -(`internal/serve`) over loopback, so Studio, `reasonix serve` and the remote UI +(`internal/frontend/serve`) over loopback, so Studio, `reasonix serve` and the remote UI all answer the same routes. ``` @@ -19,7 +19,7 @@ all answer the same routes. │ spawns, holds the lease │ ┌───────────────┴────────────────────────────▼─────────────────┐ │ cmd/reasonix-studio-host (main module, CGO-free) │ -│ internal/boot.Build → internal/control.Controller │ +│ internal/assembly/boot.Build → internal/session/control.Controller │ │ (same assembly the CLI uses: providers, tools, gate, …) │ └───────────────────────────────────────────────────────────────┘ ``` @@ -35,7 +35,7 @@ are written down in [`docs/STUDIO_SHELL_BOUNDARIES.md`](../docs/STUDIO_SHELL_BOU | --- | --- | | `electron/` | the shell: main process, preload bridge, packaging | | `frontend-next/` | the SPA it serves | -| `internal/update/` | manifest, download, verify, apply — shared by the shell and the helper | +| `internal/platform/update/` | manifest, download, verify, apply — shared by the shell and the helper | | `cmd/update-helper/` | the elevated half of an update (dpkg on Linux, versioned install on Windows) | | `cmd/studio-manifest/`, `cmd/sign/` | release-side tools | | `internal/winuninstall/` | taking a previous Windows install over | diff --git a/desktop/cmd/sign/main.go b/desktop/cmd/sign/main.go index 8a2ab8389c..9f0308de84 100644 --- a/desktop/cmd/sign/main.go +++ b/desktop/cmd/sign/main.go @@ -33,7 +33,7 @@ import ( "aead.dev/minisign" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) // platforms are the manifest keys we publish. A built artifact is matched to a key @@ -138,7 +138,7 @@ func verifyFile(path string) error { // genKey generates a fresh minisign key pair, writing the encrypted private key // (reasonix.key) and the public key (reasonix.pub) into dir. The password comes // from $MINISIGN_PASSWORD. The public key is printed — it's safe to publish; embed -// it in internal/update/verify.go. The private key never leaves dir. +// it in internal/platform/update/verify.go. The private key never leaves dir. func genKey(dir string) error { pw := os.Getenv("MINISIGN_PASSWORD") if strings.TrimSpace(pw) == "" { @@ -169,7 +169,7 @@ func genKey(dir string) error { } fmt.Printf("private key -> %s (keep secret; this is the MINISIGN_PRIVATE_KEY value)\n", keyPath) fmt.Printf("public key -> %s\n\n", pubPath) - fmt.Printf("public key (embed in internal/update/verify.go, key ID %016X):\n%s\n", pub.ID(), pubText) + fmt.Printf("public key (embed in internal/platform/update/verify.go, key ID %016X):\n%s\n", pub.ID(), pubText) return nil } diff --git a/desktop/cmd/sign/main_test.go b/desktop/cmd/sign/main_test.go index 956675a4a6..bd77eb1145 100644 --- a/desktop/cmd/sign/main_test.go +++ b/desktop/cmd/sign/main_test.go @@ -10,7 +10,7 @@ import ( "aead.dev/minisign" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) // TestSignFiles signs a file with a throwaway key pair (injected via env, exactly diff --git a/desktop/cmd/studio-manifest/arch_gate_test.go b/desktop/cmd/studio-manifest/arch_gate_test.go index 4c4ac612ec..290e978f61 100644 --- a/desktop/cmd/studio-manifest/arch_gate_test.go +++ b/desktop/cmd/studio-manifest/arch_gate_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) // archMap is desktop/electron/arch.json: what the packager builds for, and what diff --git a/desktop/cmd/studio-manifest/main.go b/desktop/cmd/studio-manifest/main.go index 11e8b6f9c2..8b23aac2e3 100644 --- a/desktop/cmd/studio-manifest/main.go +++ b/desktop/cmd/studio-manifest/main.go @@ -17,7 +17,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) const artifactPrefix = "ReasonixStudio-" diff --git a/desktop/cmd/studio-manifest/main_test.go b/desktop/cmd/studio-manifest/main_test.go index f1747100e3..4cefbfbffc 100644 --- a/desktop/cmd/studio-manifest/main_test.go +++ b/desktop/cmd/studio-manifest/main_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) func TestManifestRecordsEveryArtifactWithItsSignature(t *testing.T) { diff --git a/desktop/cmd/update-helper/main_linux.go b/desktop/cmd/update-helper/main_linux.go index f45ff41183..f86a894f4e 100644 --- a/desktop/cmd/update-helper/main_linux.go +++ b/desktop/cmd/update-helper/main_linux.go @@ -21,7 +21,7 @@ import ( "strings" "syscall" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) // Stable exit codes observed by the desktop installer. diff --git a/desktop/cmd/update-helper/main_linux_test.go b/desktop/cmd/update-helper/main_linux_test.go index d02cae9e98..1afdbb33d0 100644 --- a/desktop/cmd/update-helper/main_linux_test.go +++ b/desktop/cmd/update-helper/main_linux_test.go @@ -13,7 +13,7 @@ import ( "aead.dev/minisign" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) func TestSanitizeHelperErrorStripsPaths(t *testing.T) { diff --git a/desktop/cmd/update-helper/main_windows.go b/desktop/cmd/update-helper/main_windows.go index f378baae7f..4faf9b2de7 100644 --- a/desktop/cmd/update-helper/main_windows.go +++ b/desktop/cmd/update-helper/main_windows.go @@ -21,8 +21,8 @@ import ( "golang.org/x/sys/windows" "reasonix/desktop/internal/winuninstall" - "reasonix/internal/installlayout" - "reasonix/internal/repair" + "reasonix/internal/platform/installlayout" + "reasonix/internal/platform/repair" ) const parentExitTimeout = 2 * time.Minute diff --git a/desktop/cmd/update-helper/main_windows_test.go b/desktop/cmd/update-helper/main_windows_test.go index 0a6f11b9d8..f6e2e8d9e7 100644 --- a/desktop/cmd/update-helper/main_windows_test.go +++ b/desktop/cmd/update-helper/main_windows_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "reasonix/internal/installlayout" - "reasonix/internal/repair" + "reasonix/internal/platform/installlayout" + "reasonix/internal/platform/repair" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) const testInstallerSHA256 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" diff --git a/desktop/cmd/update-helper/release_unit.go b/desktop/cmd/update-helper/release_unit.go index 1dcc1ab4ba..186d8c6e4f 100644 --- a/desktop/cmd/update-helper/release_unit.go +++ b/desktop/cmd/update-helper/release_unit.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "reasonix/internal/repair" - "reasonix/internal/update" + "reasonix/internal/platform/repair" + "reasonix/internal/platform/update" ) const maxWindowsPayloadMetadataSize = 64 << 10 diff --git a/desktop/cmd/update-helper/release_unit_test.go b/desktop/cmd/update-helper/release_unit_test.go index 2702232b51..ad93487be6 100644 --- a/desktop/cmd/update-helper/release_unit_test.go +++ b/desktop/cmd/update-helper/release_unit_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/repair" - "reasonix/internal/tempdir" - "reasonix/internal/update" + "reasonix/internal/base/tempdir" + "reasonix/internal/platform/repair" + "reasonix/internal/platform/update" ) func TestLoadWindowsStagedReleaseUnitPreflightsAllMembersAndPublishesDesktopLast(t *testing.T) { diff --git a/desktop/cmd/update-helper/versioned_windows.go b/desktop/cmd/update-helper/versioned_windows.go index c4dd92934c..a9d65a4ea0 100644 --- a/desktop/cmd/update-helper/versioned_windows.go +++ b/desktop/cmd/update-helper/versioned_windows.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/installlayout" - "reasonix/internal/repair" + "reasonix/internal/platform/installlayout" + "reasonix/internal/platform/repair" ) // activateVersionedWindowsFromStaging publishes the versioned-v1 layout from a diff --git a/desktop/cmd/update-helper/versioned_windows_test.go b/desktop/cmd/update-helper/versioned_windows_test.go index aa5c024990..70e05639f9 100644 --- a/desktop/cmd/update-helper/versioned_windows_test.go +++ b/desktop/cmd/update-helper/versioned_windows_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/installlayout" - "reasonix/internal/repair" + "reasonix/internal/platform/installlayout" + "reasonix/internal/platform/repair" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) func TestPreferVersionedWindowsActivation(t *testing.T) { diff --git a/desktop/frontend-next/perf/README.md b/desktop/frontend-next/perf/README.md index a0b663374b..db0a4a5270 100644 --- a/desktop/frontend-next/perf/README.md +++ b/desktop/frontend-next/perf/README.md @@ -144,7 +144,7 @@ node perf/focus.mjs # 专注的守卫：拿走外围之后，退出时世 都读源码来对，不是对一份手抄清单。 - **词表不能悄悄缺。** 缺翻译时界面退回中文而不是空白，所以漏了不会自己暴露， `perf/i18n.mjs` 是替代品：源码里每个 `t("…")` 的中文 key 都要在 `i18n/en.ts` - 里有。这条对应 internal/i18n 的 catalog 测试，理由一样。 + 里有。这条对应 internal/base/i18n 的 catalog 测试，理由一样。 它读的是源码文本，所以**它自己也得说得出哪一行没读懂**。中文是合法的 JS 标识符，词表里 `"占用": "…"` 和 `占用: "…"` 两种写法都有，而它一度只认带引号 的那种——存储面板那六条于是被报成缺翻译，那六条其实一直都在。一条永远红的守卫 diff --git a/desktop/frontend-next/perf/i18n.mjs b/desktop/frontend-next/perf/i18n.mjs index c3d4db8446..b0f8840888 100644 --- a/desktop/frontend-next/perf/i18n.mjs +++ b/desktop/frontend-next/perf/i18n.mjs @@ -1,6 +1,6 @@ // 词表守卫：源码里每个 t("…") 的中文 key，英文词表都要有；反过来词表里也不 // 该留下源码已经不用的条目。缺翻译时界面会退回中文而不是空白，正因如此漏了 -// 不会自己暴露 —— 这个检查就是替代品，对应 internal/i18n 的 catalog 测试。 +// 不会自己暴露 —— 这个检查就是替代品，对应 internal/base/i18n 的 catalog 测试。 import { readFileSync, readdirSync, statSync } from "node:fs"; import { join, dirname } from "node:path"; import { fileURLToPath } from "node:url"; diff --git a/desktop/frontend-next/src/i18n/index.ts b/desktop/frontend-next/src/i18n/index.ts index b8174bb8e4..ae0a988962 100644 --- a/desktop/frontend-next/src/i18n/index.ts +++ b/desktop/frontend-next/src/i18n/index.ts @@ -11,7 +11,7 @@ const DICTS: Record> = { zh: {}, en: EN }; // more than it returns, and this way the call site still reads as the sentence // it renders — a translation that is missing falls back to the original rather // than to a blank or a key. The catalogue's completeness is a test's job, the -// same way internal/i18n does it for the CLI. +// same way internal/base/i18n does it for the CLI. let lang: Lang = "zh"; let dict = DICTS.zh; diff --git a/desktop/frontend-next/src/port/hub.ts b/desktop/frontend-next/src/port/hub.ts index 2d5668bcb8..b51f912312 100644 --- a/desktop/frontend-next/src/port/hub.ts +++ b/desktop/frontend-next/src/port/hub.ts @@ -7,7 +7,7 @@ import { SsePort } from "./sse"; // and a missed round loses nothing, because the snapshot is the record. const ASK_POLL_MS = 500; -// Must match operationHeader in internal/serve. The caller names the operation +// Must match operationHeader in internal/frontend/serve. The caller names the operation // because the question can arrive before the response does. function operationHeaders(operationId?: string): Record { return operationId ? { "x-reasonix-operation-id": operationId } : {}; diff --git a/desktop/frontend-next/src/port/mock_mcp.ts b/desktop/frontend-next/src/port/mock_mcp.ts index a1ba1dadc8..fa939fb001 100644 --- a/desktop/frontend-next/src/port/mock_mcp.ts +++ b/desktop/frontend-next/src/port/mock_mcp.ts @@ -139,10 +139,10 @@ export class MockMcp extends MockProvider { s.state = s.error ? "failed" : s.tools ? "standby" : "idle"; } - // A rough stand-in for internal/mcpsetup: enough shape for the confirmation + // A rough stand-in for internal/ext/mcpsetup: enough shape for the confirmation // card to be developed against, not a second implementation of the grammar. - // A rough stand-in for internal/mcpsetup: enough shape for the confirmation + // A rough stand-in for internal/ext/mcpsetup: enough shape for the confirmation // card to be developed against, not a second implementation of the grammar. async parseMcp(input: string): Promise { const text = input.trim(); diff --git a/desktop/frontend-next/src/port/session.ts b/desktop/frontend-next/src/port/session.ts index e7684ea9bc..5395079e34 100644 --- a/desktop/frontend-next/src/port/session.ts +++ b/desktop/frontend-next/src/port/session.ts @@ -39,7 +39,7 @@ export interface HistoryToolCall { capabilityId?: string; } -// GET /todos as internal/serve writes it: the canonical task list, the latest +// GET /todos as internal/frontend/serve writes it: the canonical task list, the latest // todo_write merged with every complete_step advance. Deriving it from the // transcript instead loses the advances and keeps the refused writes. // A tab the agent's browser has open. target is the browser's own id for the @@ -59,7 +59,7 @@ export interface HostTodo { level?: number; } -// GET /checkpoints as internal/serve writes it: the snapshot the kernel took +// GET /checkpoints as internal/frontend/serve writes it: the snapshot the kernel took // before each turn's first write. prompt is the user's own text, with the // compose prefixes already stripped kernel-side. export interface Checkpoint { @@ -140,7 +140,7 @@ export type Preset = "light" | "balanced" | "delivery"; // will honour rides on the request — see Approval.allowsSession/allowsPersist. export type ApprovalVerdict = "once" | "session" | "always" | "deny"; -// Shape of GET /status as internal/serve writes it. Anything the UI wants that +// Shape of GET /status as internal/frontend/serve writes it. Anything the UI wants that // is not here has to be added on the Go side, not invented in the client. // PlanAction is what a plan card can answer. The three are distinct kernel // transitions, not an allow/deny pair: revising keeps planning, exiting leaves @@ -251,7 +251,7 @@ export interface JobEntry { startedAt: number; } -// The UI depends on this and nothing else. SsePort talks to internal/serve; +// The UI depends on this and nothing else. SsePort talks to internal/frontend/serve; // MockPort replays a fixture. Neither is allowed to leak transport details // upward, which is what keeps the same UI usable in a browser and in a shell. export interface SessionEntry { diff --git a/desktop/frontend-next/src/port/tokens.ts b/desktop/frontend-next/src/port/tokens.ts index 5382eed03f..b3e12cae12 100644 --- a/desktop/frontend-next/src/port/tokens.ts +++ b/desktop/frontend-next/src/port/tokens.ts @@ -1,4 +1,4 @@ -// Mirrors internal/tokencount.Text: Latin near four bytes per token, CJK near +// Mirrors internal/base/tokencount.Text: Latin near four bytes per token, CJK near // one token per character. Used to size streamed deltas, which arrive as text // and carry no count of their own — usage only lands at the end of a round. export function estimateTokens(s: string): number { diff --git a/desktop/frontend-next/src/port/wire.ts b/desktop/frontend-next/src/port/wire.ts index 0b435056c2..fa7430b2f8 100644 --- a/desktop/frontend-next/src/port/wire.ts +++ b/desktop/frontend-next/src/port/wire.ts @@ -1,4 +1,4 @@ -// Mirrors internal/eventwire. Field names and kind strings must match exactly; +// Mirrors internal/contract/eventwire. Field names and kind strings must match exactly; // this file is the contract, not a convenience shape. export type Kind = @@ -509,7 +509,7 @@ export interface ReceiptGap { } // The run's execution graph, published as facts rather than drawn from id -// prefixes. Mirrors internal/agentgraph: a node named again updates the one +// prefixes. Mirrors internal/contract/agentgraph: a node named again updates the one // already there, and an edge kind is what tells "waited for this" apart from // "started from this answer". export type GraphNodeKind = "group" | "worker" | "external"; diff --git a/desktop/frontend-next/src/state/graph.ts b/desktop/frontend-next/src/state/graph.ts index 67505efd50..2dc9ae6a23 100644 --- a/desktop/frontend-next/src/state/graph.ts +++ b/desktop/frontend-next/src/state/graph.ts @@ -1,6 +1,6 @@ import type { ExecutionGraph, GraphDelta, GraphEdge, GraphNode } from "../port/wire"; -// The run graph, folded the way internal/agentgraph folds it. The kernel is the +// The run graph, folded the way internal/contract/agentgraph folds it. The kernel is the // only thing that knows a dependency from a delivered answer, so this reducer // reads what it published rather than re-deriving structure from id prefixes — // which is what the panel used to do, and why it could only ever draw a list. diff --git a/desktop/frontend-next/src/state/say.test.ts b/desktop/frontend-next/src/state/say.test.ts index c7dc91fa1f..31cd31b34e 100644 --- a/desktop/frontend-next/src/state/say.test.ts +++ b/desktop/frontend-next/src/state/say.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; import { initialState, reduce, type Item, type SessionEvent } from "./session"; -// The kinds internal/serve/wirelog.go keeps. Everything else is dropped from +// The kinds internal/frontend/serve/wirelog.go keeps. Everything else is dropped from // the record on purpose — streamed deltas are one frame per chunk and say // nothing the settled frame does not. const KEPT = new Set(["turn_started", "message", "tool_dispatch", "tool_result", "turn_done"]); diff --git a/desktop/frontend-next/src/state/session.ts b/desktop/frontend-next/src/state/session.ts index be79474b7b..ce4b26393d 100644 --- a/desktop/frontend-next/src/state/session.ts +++ b/desktop/frontend-next/src/state/session.ts @@ -640,7 +640,7 @@ function withReceipt(items: Item[], r?: Receipt): Item[] { // instructions to the model, not something the user said, so they never reach // the transcript. This list mirrors agent.TransientUserBlockTags by hand, and // naming a subset of it is how rendered as a user message: -// the same drift internal/history/strip.go records having had with five of +// the same drift internal/state/history/strip.go records having had with five of // eleven. The server strips these before /history now — this is what covers // sessions already on disk. const CONTROL = diff --git a/desktop/frontend-next/src/ui/theme.ts b/desktop/frontend-next/src/ui/theme.ts index fd82de0f57..1b9757618c 100644 --- a/desktop/frontend-next/src/ui/theme.ts +++ b/desktop/frontend-next/src/ui/theme.ts @@ -4,7 +4,7 @@ import type { ThemePack } from "../port/port"; // The mapping lives on this side because only the frontend knows what each // surface in its layout is called — a pack should not have to learn our // variable names to be worth installing. The vocabulary itself is the kernel's -// (internal/theme.Tokens), and TestThemeTokenVocabularyMatchesTheFrontend holds +// (internal/ext/theme.Tokens), and TestThemeTokenVocabularyMatchesTheFrontend holds // the two halves together. const SURFACE: Record = { bg: ["--page"], diff --git a/docs/EXTENSIONS.md b/docs/EXTENSIONS.md index 07f90f94d6..99efb975a0 100644 --- a/docs/EXTENSIONS.md +++ b/docs/EXTENSIONS.md @@ -107,7 +107,7 @@ destroy cache reuse; dynamic data should stay in the current turn tail when possible. Maintainers can measure host overhead with: ```bash -go test ./internal/extension/... -run '^$' -bench 'Extension|Dispatch' -benchmem +go test ./internal/ext/extension/... -run '^$' -bench 'Extension|Dispatch' -benchmem ``` ## Developing an extension diff --git a/docs/EXTENSION_PROTOCOL.generated.md b/docs/EXTENSION_PROTOCOL.generated.md index 5088d2a6ec..e774b5bd09 100644 --- a/docs/EXTENSION_PROTOCOL.generated.md +++ b/docs/EXTENSION_PROTOCOL.generated.md @@ -4,7 +4,7 @@ - Protocol ID: `reasonix.extension.v2` - Protocol major: `2` -- Schema: `internal/extension/protocol/schema.generated.json` +- Schema: `internal/ext/extension/protocol/schema.generated.json` - Schema hash: `sha256:085c014bb6d1713f722177dda5d79b1224d9bf611cb3947d3331aeb0768449fa` Within major v2 only optional fields, new enum values, and new methods may diff --git a/docs/EXTENSION_PROTOCOL.md b/docs/EXTENSION_PROTOCOL.md index cd5dbfabf9..cc22b093e9 100644 --- a/docs/EXTENSION_PROTOCOL.md +++ b/docs/EXTENSION_PROTOCOL.md @@ -7,7 +7,7 @@ owns replacement strategies, contributes streaming model providers, and publishes structured UI — without ever linking into the host binary. - Protocol ID: `reasonix.extension.v2` -- Machine-readable schema: `internal/extension/protocol/schema.generated.json` +- Machine-readable schema: `internal/ext/extension/protocol/schema.generated.json` - Method/event/limit/error index: `docs/EXTENSION_PROTOCOL.generated.md` (generated, drift-checked in CI) - Go SDK (implements everything below): `sdk/go` diff --git a/docs/EXTENSION_RUNTIME_V2_PERF.md b/docs/EXTENSION_RUNTIME_V2_PERF.md index f47fcfe48f..5ae135b82c 100644 --- a/docs/EXTENSION_RUNTIME_V2_PERF.md +++ b/docs/EXTENSION_RUNTIME_V2_PERF.md @@ -1,7 +1,7 @@ # Extension Runtime v2 — Performance baselines -Soft CI thresholds live in `internal/extension/bench_threshold_test.go`. -Benchmarks live in `internal/extension/benchmark_test.go`. +Soft CI thresholds live in `internal/ext/extension/bench_threshold_test.go`. +Benchmarks live in `internal/ext/extension/benchmark_test.go`. ## Targets (developer machine / CI soft fail) @@ -19,9 +19,9 @@ Benchmarks live in `internal/extension/benchmark_test.go`. Measure: ```bash -go test ./internal/extension/ -run 'TestGraphAndPlanLatencyBaseline|TestEffectScopeDisposeBaseline' -count=1 -go test ./internal/extension/ -bench 'BenchmarkDependencyGraphAndPlan|BenchmarkExtensionKernelStartup' -benchmem -count=3 -go test ./internal/boot/ -run 'TestIntegrationNoOpDoesNotBuildNewController|TestRebuildFromNoOp' -count=1 +go test ./internal/ext/extension/ -run 'TestGraphAndPlanLatencyBaseline|TestEffectScopeDisposeBaseline' -count=1 +go test ./internal/ext/extension/ -bench 'BenchmarkDependencyGraphAndPlan|BenchmarkExtensionKernelStartup' -benchmem -count=3 +go test ./internal/assembly/boot/ -run 'TestIntegrationNoOpDoesNotBuildNewController|TestRebuildFromNoOp' -count=1 ``` ## Cache hit expectation diff --git a/docs/REASONING_PROVIDERS.md b/docs/REASONING_PROVIDERS.md index 420eaa7346..59f9d94adc 100644 --- a/docs/REASONING_PROVIDERS.md +++ b/docs/REASONING_PROVIDERS.md @@ -8,7 +8,7 @@ known backend uses and which parameters it honours or ignores. ## Auto-detected backends -These are recognised by base URL (see `internal/provider/openai/host.go`) and +These are recognised by base URL (see `internal/model/openai/host.go`) and get a tailored request shape automatically — no extra config needed. | Provider | Base URL | Reasoning control | `/effort` levels | Notes | diff --git a/docs/SPEC.md b/docs/SPEC.md index f1dd7b8afc..be212df4c1 100644 --- a/docs/SPEC.md +++ b/docs/SPEC.md @@ -61,7 +61,7 @@ prompts) so the desktop module consumes the same surface. See §Remote below. ## 3. Core Abstractions -### 3.1 Provider + registry (`internal/provider`) +### 3.1 Provider + registry (`internal/contract/provider`) ```go type Provider interface { @@ -106,7 +106,7 @@ type Config struct { - Streaming tool-call deltas are accumulated by index inside the provider; only complete `ToolCall`s are emitted. -### 3.2 Tool + registry (`internal/tool`) +### 3.2 Tool + registry (`internal/contract/tool`) ```go type Tool interface { @@ -127,7 +127,7 @@ type Tool interface { - `Execute` parses raw JSON args itself. Errors are returned, not fatal — the agent feeds them back so the model can self-correct. -### 3.3 Plugins (`internal/plugin`) — MCP client +### 3.3 Plugins (`internal/ext/plugin`) — MCP client An external plugin is an MCP server declared in config. The wire protocol is **JSON-RPC 2.0** in every case; only the transport differs. A `transport` @@ -195,7 +195,7 @@ interface (`call` / `notify` / `close`) abstracts that, so the MCP-level logic - `cmd/reasonix-plugin-example` is a runnable reference stdio server (`echo`, `wordcount`), driven by an end-to-end test that builds the real binary. -### 3.4 Agent (`internal/agent`) +### 3.4 Agent (`internal/runtime/agent`) - `Session` holds `[]Message`. - `Run(ctx, input)` loop: build `Request` (with tool schemas) → `provider.Stream` @@ -384,7 +384,7 @@ This is the **only** point where the prompt prefix changes — a deliberate, rar stays cache-friendly, so cache hit rate (the key observability signal) stays high. `context_window = 0` disables compaction for an instance. -### 3.7 Permissions (`internal/permission`) — per-call gating +### 3.7 Permissions (`internal/safety/permission`) — per-call gating A coding agent runs shell commands and edits files autonomously. The permission layer decides, **per tool call**, whether to allow it, deny it, or ask the user @@ -567,7 +567,7 @@ fallback in unattended automation; `--permission-mode auto` is equivalent. Explicit `ask` rules still fail closed under Auto, and `deny` rules harden every posture. -### 3.8 Slash commands (`internal/command`) +### 3.8 Slash commands (`internal/ext/command`) The chat TUI accepts `/command` input. Three kinds share one dispatch: @@ -704,7 +704,7 @@ retry or verification policy — those are decided by the task or the scheduler. Skill frontmatter may keep growing; `agent.ProfileFromSkill` is the single narrowing point, and routing metadata (triggers, auto-use, cost, freshness) stops there because it decides *when* a worker is chosen, not how it thinks. -`internal/agent/profile_boundary_test.go` fails on any widening. +`internal/runtime/agent/profile_boundary_test.go` fails on any widening. ### 3.11 Sub-agents close with a host-adjudicated claim @@ -900,9 +900,9 @@ An entry point that must not persist a transcript says so with `ContextRequest.Ephemeral` rather than building its own session, so its promise is a field on the spec instead of a second construction path. -`internal/agent/spawn_boundary_test.go` enumerates the files that still call the +`internal/runtime/agent/spawn_boundary_test.go` enumerates the files that still call the low-level runners directly and fails on any new one. The remaining entries — -`internal/boot` (skill runners), `internal/cli/review.go`, and +`internal/assembly/boot` (skill runners), `internal/frontend/cli/review.go`, and `desktop/subagents_app.go` — are known debt, not precedent. ### 3.16 MCP concurrency: read-only is not stateless @@ -1034,7 +1034,7 @@ Not yet measured, and deliberately not faked: rework-after-handoff needs mutation ordering across a whole run, which belongs to the harness driving the arms rather than the instrument recording one. -## 4. Data Types (`internal/provider`) +## 4. Data Types (`internal/contract/provider`) ```go type Role string diff --git a/docs/STUDIO_SHELL_BOUNDARIES.md b/docs/STUDIO_SHELL_BOUNDARIES.md index f3bf3ce6d3..63472e33a2 100644 --- a/docs/STUDIO_SHELL_BOUNDARIES.md +++ b/docs/STUDIO_SHELL_BOUNDARIES.md @@ -28,7 +28,7 @@ a counter of its own turns it red. The kernel reaches a separate-process renderer through a socket, so the socket carries a boundary the host owns and no configuration can switch off -(`internal/serve/loopback.go`): +(`internal/frontend/serve/loopback.go`): - `tcp4 127.0.0.1:0` — never a wildcard, never a name a resolver answers for. - A credential minted per launch from `crypto/rand`, never read from config and @@ -103,7 +103,7 @@ here as well. - The helper draws its own cursor where the agent acts. Escape pressed while it shows stops the run between steps. -`internal/computer/live_test.go` (`REASONIX_LIVE_COMPUTER=`) drives a +`internal/platform/computer/live_test.go` (`REASONIX_LIVE_COMPUTER=`) drives a real application through the helper. ## 6. State taxonomy diff --git a/docs/THEME_PACK.md b/docs/THEME_PACK.md index e4bff917d4..f9a479fa57 100644 --- a/docs/THEME_PACK.md +++ b/docs/THEME_PACK.md @@ -4,7 +4,7 @@ archives. What Reasonix Studio reads instead: - one directory per pack, holding a `theme.json` (`schemaVersion: 1`) and - optional `background` and `preview` images, read by `internal/theme`; + optional `background` and `preview` images, read by `internal/ext/theme`; - plugin themes are packs of that shape, listed as `plugin::` (see `docs/PLUGIN_PACKAGES.md`). diff --git a/docs/TOOL_CONTRACT.md b/docs/TOOL_CONTRACT.md index 6b4c2bfd7f..1a06884421 100644 --- a/docs/TOOL_CONTRACT.md +++ b/docs/TOOL_CONTRACT.md @@ -38,7 +38,7 @@ This document records the provider-visible contract for Reasonix compile-time bu The exact canonical schemas are intentionally tested in code rather than copied by hand here. Run: ```bash -go test ./internal/tool -run TestBuiltinToolContractDocumentation +go test ./internal/contract/tool -run TestBuiltinToolContractDocumentation ``` The test checks that every registered built-in tool has a documented name, read-only flag, description row, and canonical schema generated by `tool.BuiltinContractEntries`. @@ -123,7 +123,7 @@ provider-visible surface for every execution setting (`light` | `balanced` | expanded into the top-level provider schema; the model reaches them through `use_capability` without cache-breaking schema churn. -`internal/boot.TestBootToolContractMatchesProviderVisibleSurface` verifies the +`internal/assembly/boot.TestBootToolContractMatchesProviderVisibleSurface` verifies the actual boot registry contract against the provider request, including read-only flags and canonical schemas. diff --git a/internal/boot/ablation_test.go b/internal/assembly/boot/ablation_test.go similarity index 96% rename from internal/boot/ablation_test.go rename to internal/assembly/boot/ablation_test.go index 4b040cfb36..de9419c7ea 100644 --- a/internal/boot/ablation_test.go +++ b/internal/assembly/boot/ablation_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/ablation" - "reasonix/internal/event" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" ) func builtToolNames(t *testing.T, set ablation.Set) map[string]bool { diff --git a/internal/boot/add_dir_root_test.go b/internal/assembly/boot/add_dir_root_test.go similarity index 100% rename from internal/boot/add_dir_root_test.go rename to internal/assembly/boot/add_dir_root_test.go diff --git a/internal/boot/agent_graph_effect_test.go b/internal/assembly/boot/agent_graph_effect_test.go similarity index 98% rename from internal/boot/agent_graph_effect_test.go rename to internal/assembly/boot/agent_graph_effect_test.go index cdf262b9e7..b0a9611149 100644 --- a/internal/boot/agent_graph_effect_test.go +++ b/internal/assembly/boot/agent_graph_effect_test.go @@ -10,8 +10,8 @@ import ( "sync" "testing" - "reasonix/internal/agentgraph" - "reasonix/internal/event" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" ) // graphEffectCall dispatches a two-item fleet with a dependency in it. Every diff --git a/internal/boot/agent_preset.go b/internal/assembly/boot/agent_preset.go similarity index 97% rename from internal/boot/agent_preset.go rename to internal/assembly/boot/agent_preset.go index cd7417e1e2..6547b8a7df 100644 --- a/internal/boot/agent_preset.go +++ b/internal/assembly/boot/agent_preset.go @@ -1,10 +1,10 @@ package boot import ( - "reasonix/internal/ablation" - "reasonix/internal/agentpreset" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/agentpreset" + "reasonix/internal/contract/tool" + "reasonix/internal/tools/builtin" ) // Canonical Agent role-setting identifiers re-exported for frontends that diff --git a/internal/boot/anthropic_contract_test.go b/internal/assembly/boot/anthropic_contract_test.go similarity index 97% rename from internal/boot/anthropic_contract_test.go rename to internal/assembly/boot/anthropic_contract_test.go index 28f7267ebe..32bc0425cc 100644 --- a/internal/boot/anthropic_contract_test.go +++ b/internal/assembly/boot/anthropic_contract_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/config" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) const anthropicStopStream = `event: message_start diff --git a/internal/boot/assembly_reuse.go b/internal/assembly/boot/assembly_reuse.go similarity index 89% rename from internal/boot/assembly_reuse.go rename to internal/assembly/boot/assembly_reuse.go index a37d2ab9e2..7bd4e8ed46 100644 --- a/internal/boot/assembly_reuse.go +++ b/internal/assembly/boot/assembly_reuse.go @@ -3,17 +3,17 @@ package boot import ( "strings" - "reasonix/internal/command" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/hook" - "reasonix/internal/instruction" - "reasonix/internal/memory" - "reasonix/internal/migration" - "reasonix/internal/skill" - "reasonix/internal/storage" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/command" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" + "reasonix/internal/state/instruction" + "reasonix/internal/state/memory" + "reasonix/internal/state/migration" + "reasonix/internal/state/storage" ) // ReusedAssembly holds rediscovery-free inputs for narrow/no-op rebuilds. diff --git a/internal/boot/assembly_reuse_test.go b/internal/assembly/boot/assembly_reuse_test.go similarity index 97% rename from internal/boot/assembly_reuse_test.go rename to internal/assembly/boot/assembly_reuse_test.go index a95249a95a..c8a5eff6db 100644 --- a/internal/boot/assembly_reuse_test.go +++ b/internal/assembly/boot/assembly_reuse_test.go @@ -3,7 +3,7 @@ package boot import ( "testing" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) func TestShouldReuseDiscoveryKinds(t *testing.T) { diff --git a/internal/boot/audit_forwarding_test.go b/internal/assembly/boot/audit_forwarding_test.go similarity index 87% rename from internal/boot/audit_forwarding_test.go rename to internal/assembly/boot/audit_forwarding_test.go index dd716fedcb..318281d563 100644 --- a/internal/boot/audit_forwarding_test.go +++ b/internal/assembly/boot/audit_forwarding_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/notify" - "reasonix/internal/stats" - "reasonix/internal/trajectory" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/platform/notify" + "reasonix/internal/session/control" + "reasonix/internal/state/stats" + "reasonix/internal/state/trajectory" ) // A wrapper that forwards one audit but forgets another drops its data diff --git a/internal/boot/authority_boundary_test.go b/internal/assembly/boot/authority_boundary_test.go similarity index 98% rename from internal/boot/authority_boundary_test.go rename to internal/assembly/boot/authority_boundary_test.go index 489b53964a..f3fe49214f 100644 --- a/internal/boot/authority_boundary_test.go +++ b/internal/assembly/boot/authority_boundary_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/evidence" - "reasonix/internal/skill" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/evidence" ) // Delivering a report and being believed by it are separate permissions. This diff --git a/internal/boot/authority_provenance_test.go b/internal/assembly/boot/authority_provenance_test.go similarity index 98% rename from internal/boot/authority_provenance_test.go rename to internal/assembly/boot/authority_provenance_test.go index 182ed1a923..dd0f57be2f 100644 --- a/internal/boot/authority_provenance_test.go +++ b/internal/assembly/boot/authority_provenance_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/sandbox" + "reasonix/internal/contract/config" + "reasonix/internal/safety/sandbox" ) // shortSocket listens on a path short enough for the ~104-byte sun_path limit, diff --git a/internal/boot/bash_steer_surface_test.go b/internal/assembly/boot/bash_steer_surface_test.go similarity index 97% rename from internal/boot/bash_steer_surface_test.go rename to internal/assembly/boot/bash_steer_surface_test.go index 1fae277e34..7a109143be 100644 --- a/internal/boot/bash_steer_surface_test.go +++ b/internal/assembly/boot/bash_steer_surface_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/tool/builtin" + "reasonix/internal/tools/builtin" ) // A steered name missing from the provider schema cannot be called, so the whole diff --git a/internal/boot/boot.go b/internal/assembly/boot/boot.go similarity index 98% rename from internal/boot/boot.go rename to internal/assembly/boot/boot.go index 294ba0d884..51254263d6 100644 --- a/internal/boot/boot.go +++ b/internal/assembly/boot/boot.go @@ -22,39 +22,39 @@ import ( "sync/atomic" "time" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/capability" - "reasonix/internal/command" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/providerext" - "reasonix/internal/extension/sidecar" - "reasonix/internal/extension/uihub" - "reasonix/internal/guardian" - "reasonix/internal/history" - "reasonix/internal/hook" - "reasonix/internal/lsp" - "reasonix/internal/mcplaunch" - "reasonix/internal/memory" - "reasonix/internal/netclient" - "reasonix/internal/permission" - "reasonix/internal/plugin" - "reasonix/internal/pluginspec" - "reasonix/internal/productdocs" - "reasonix/internal/provider" - "reasonix/internal/recovery" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/sessiontemp" - "reasonix/internal/skill" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" - "reasonix/internal/tool/sessiontool" + "reasonix/internal/base/netclient" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/command" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/providerext" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/extension/uihub" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/mcplaunch" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/pluginspec" + "reasonix/internal/ext/skill" + "reasonix/internal/platform/lsp" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/recovery" + "reasonix/internal/safety/guardian" + "reasonix/internal/safety/permission" + "reasonix/internal/safety/sandbox" + "reasonix/internal/session/control" + "reasonix/internal/state/history" + "reasonix/internal/state/memory" + "reasonix/internal/state/sessiontemp" + "reasonix/internal/tools/builtin" + "reasonix/internal/tools/productdocs" + "reasonix/internal/tools/sessiontool" ) // ErrUnknownModel is returned by Build when the configured model can't be diff --git a/internal/boot/boot_safe_mode_test.go b/internal/assembly/boot/boot_safe_mode_test.go similarity index 97% rename from internal/boot/boot_safe_mode_test.go rename to internal/assembly/boot/boot_safe_mode_test.go index db73c5b4e6..29f94f01e6 100644 --- a/internal/boot/boot_safe_mode_test.go +++ b/internal/assembly/boot/boot_safe_mode_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/plugin" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/ext/plugin" ) // v1.20+ removes product Safe Mode. REASONIX_SAFE_MODE no longer changes boot diff --git a/internal/boot/boot_test.go b/internal/assembly/boot/boot_test.go similarity index 99% rename from internal/boot/boot_test.go rename to internal/assembly/boot/boot_test.go index b93d0f0f54..78ca7de995 100644 --- a/internal/boot/boot_test.go +++ b/internal/assembly/boot/boot_test.go @@ -23,26 +23,26 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/agent/testutil" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/memory" - "reasonix/internal/netclient" - "reasonix/internal/plugin" - "reasonix/internal/pluginpkg" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/skill" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/base/netclient" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/agent/testutil" + "reasonix/internal/safety/sandbox" + "reasonix/internal/session/control" + "reasonix/internal/state/memory" + "reasonix/internal/tools/builtin" // Blank import registers the provider kind the same way cmd/reasonix's main // does; importing builtin above registers the built-in tools. - _ "reasonix/internal/provider/anthropic" - _ "reasonix/internal/provider/openai" + _ "reasonix/internal/model/anthropic" + _ "reasonix/internal/model/openai" ) func newProviderForTest(e *config.ProviderEntry) (provider.Provider, error) { @@ -1155,7 +1155,7 @@ func subagentRefFromHistory(t *testing.T, msgs []provider.Message) string { // TestBuildHeadlessRunRunsTaskSubagentWithoutSessionPath reproduces headless // `reasonix run`: a controller built via Build with NO SetSessionPath (exactly -// what internal/cli.runAgent does) must still be able to run a `task` sub-agent. +// what internal/frontend/cli.runAgent does) must still be able to run a `task` sub-agent. // Before the ephemeral fallback this failed with "parent session is required". func TestBuildHeadlessRunRunsTaskSubagentWithoutSessionPath(t *testing.T) { isolateConfigHome(t) @@ -2319,7 +2319,7 @@ model = "x" fullReq, _ := captureTokenProfileSurface(t, TokenModeFull) economyReq, _ := captureTokenProfileSurface(t, TokenModeEconomy) - doc, err := os.ReadFile(filepath.Join(pkgDir, "..", "..", "docs", "TOOL_CONTRACT.md")) + doc, err := os.ReadFile(filepath.Join(pkgDir, "..", "..", "..", "docs", "TOOL_CONTRACT.md")) if err != nil { t.Fatalf("read tool contract doc: %v", err) } @@ -4316,11 +4316,11 @@ func TestBuildExtraPluginProbeKeepsSessionProcessAlive(t *testing.T) { // TestHelperProcess is invoked as a subprocess by TestBuildEagerStartsAtBoot // and TestBuildLazyDoesNotConnectAtBoot. It mirrors the minimal MCP stdio -// server in internal/plugin/plugin_test.go so the boot package can drive an +// server in internal/ext/plugin/plugin_test.go so the boot package can drive an // end-to-end handshake without depending on the plugin package's test helper // (Go's testing framework only re-invokes the binary of the test package // currently running). The helper gates on GO_WANT_HELPER_PROCESS=1 so a -// normal `go test ./internal/boot/...` does not trip it. +// normal `go test ./internal/assembly/boot/...` does not trip it. func TestHelperProcess(t *testing.T) { if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" { return diff --git a/internal/boot/browser.go b/internal/assembly/boot/browser.go similarity index 90% rename from internal/boot/browser.go rename to internal/assembly/boot/browser.go index 12a4592a0e..78de453757 100644 --- a/internal/boot/browser.go +++ b/internal/assembly/boot/browser.go @@ -4,11 +4,11 @@ import ( "path/filepath" "strings" - "reasonix/internal/browser" - "reasonix/internal/config" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" - "reasonix/internal/workspaceid" + "reasonix/internal/base/workspaceid" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/platform/browser" + "reasonix/internal/tools/builtin" ) // browserPool is process-wide: controllers on one workspace share its diff --git a/internal/boot/browser_rebuild_test.go b/internal/assembly/boot/browser_rebuild_test.go similarity index 95% rename from internal/boot/browser_rebuild_test.go rename to internal/assembly/boot/browser_rebuild_test.go index 270cfee012..7971da04a0 100644 --- a/internal/boot/browser_rebuild_test.go +++ b/internal/assembly/boot/browser_rebuild_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "reasonix/internal/browser" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/platform/browser" ) // A model switch rebuilds the runtime; the agent's browser, and the tabs it has diff --git a/internal/boot/capability_discovery_effect_test.go b/internal/assembly/boot/capability_discovery_effect_test.go similarity index 98% rename from internal/boot/capability_discovery_effect_test.go rename to internal/assembly/boot/capability_discovery_effect_test.go index 31b7a3e7cf..0296182cfd 100644 --- a/internal/boot/capability_discovery_effect_test.go +++ b/internal/assembly/boot/capability_discovery_effect_test.go @@ -11,9 +11,9 @@ import ( "sync" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // capabilityProbeProvider issues one scripted use_capability call per round, diff --git a/internal/boot/catalog_host_effect_test.go b/internal/assembly/boot/catalog_host_effect_test.go similarity index 96% rename from internal/boot/catalog_host_effect_test.go rename to internal/assembly/boot/catalog_host_effect_test.go index fc47369485..d908f267c1 100644 --- a/internal/boot/catalog_host_effect_test.go +++ b/internal/assembly/boot/catalog_host_effect_test.go @@ -9,9 +9,9 @@ import ( "sync" "testing" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) type effectUsageProvider struct{} diff --git a/internal/boot/coalesce_wiring_test.go b/internal/assembly/boot/coalesce_wiring_test.go similarity index 96% rename from internal/boot/coalesce_wiring_test.go rename to internal/assembly/boot/coalesce_wiring_test.go index 9efc9206f9..2da40ca72e 100644 --- a/internal/boot/coalesce_wiring_test.go +++ b/internal/assembly/boot/coalesce_wiring_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) type coalesceWiringProvider struct{ deltas int } diff --git a/internal/boot/compaction_budgets.go b/internal/assembly/boot/compaction_budgets.go similarity index 89% rename from internal/boot/compaction_budgets.go rename to internal/assembly/boot/compaction_budgets.go index 9c5aef094f..9cba1e17b4 100644 --- a/internal/boot/compaction_budgets.go +++ b/internal/assembly/boot/compaction_budgets.go @@ -1,8 +1,8 @@ package boot import ( - "reasonix/internal/agent" - "reasonix/internal/config" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" ) // compactionBudgets carries the user's fold bounds to every agent the boot diff --git a/internal/boot/compaction_retention_effect_test.go b/internal/assembly/boot/compaction_retention_effect_test.go similarity index 98% rename from internal/boot/compaction_retention_effect_test.go rename to internal/assembly/boot/compaction_retention_effect_test.go index 5c4b7ff32e..d45ff00b5b 100644 --- a/internal/boot/compaction_retention_effect_test.go +++ b/internal/assembly/boot/compaction_retention_effect_test.go @@ -6,8 +6,8 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // compactionEffectProvider answers ordinary turns with enough text to drive the diff --git a/internal/boot/compress_tool_test.go b/internal/assembly/boot/compress_tool_test.go similarity index 95% rename from internal/boot/compress_tool_test.go rename to internal/assembly/boot/compress_tool_test.go index 6750741b38..d98a3b1983 100644 --- a/internal/boot/compress_tool_test.go +++ b/internal/assembly/boot/compress_tool_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent/testutil" ) func TestCompressOnUnifiedSurfaceForAllRoleSettings(t *testing.T) { diff --git a/internal/boot/computer.go b/internal/assembly/boot/computer.go similarity index 85% rename from internal/boot/computer.go rename to internal/assembly/boot/computer.go index 092dec1590..cc30647842 100644 --- a/internal/boot/computer.go +++ b/internal/assembly/boot/computer.go @@ -1,11 +1,11 @@ package boot import ( - "reasonix/internal/browser" - "reasonix/internal/computer" - "reasonix/internal/config" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/platform/browser" + "reasonix/internal/platform/computer" + "reasonix/internal/tools/builtin" ) // computerHelper is the native helper of a host that can operate this diff --git a/internal/boot/config_home_test.go b/internal/assembly/boot/config_home_test.go similarity index 96% rename from internal/boot/config_home_test.go rename to internal/assembly/boot/config_home_test.go index 0687fd5faf..bfaeda3371 100644 --- a/internal/boot/config_home_test.go +++ b/internal/assembly/boot/config_home_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "reasonix/internal/history" - "reasonix/internal/historycatalog" + "reasonix/internal/state/history" + "reasonix/internal/state/historycatalog" ) // isolateConfigHome redirects user config and cache paths to a per-test temp diff --git a/internal/boot/context_budget_effect_test.go b/internal/assembly/boot/context_budget_effect_test.go similarity index 96% rename from internal/boot/context_budget_effect_test.go rename to internal/assembly/boot/context_budget_effect_test.go index 6ee9ffce62..a5e5780cd1 100644 --- a/internal/boot/context_budget_effect_test.go +++ b/internal/assembly/boot/context_budget_effect_test.go @@ -6,9 +6,9 @@ import ( "sync" "testing" - "reasonix/internal/ablation" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // budgetEffectProvider pads every reply so the transcript climbs toward the diff --git a/internal/boot/context_projection_test.go b/internal/assembly/boot/context_projection_test.go similarity index 98% rename from internal/boot/context_projection_test.go rename to internal/assembly/boot/context_projection_test.go index 072e77bf76..863c31ccae 100644 --- a/internal/boot/context_projection_test.go +++ b/internal/assembly/boot/context_projection_test.go @@ -8,19 +8,19 @@ import ( "context" "os" "path/filepath" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" "slices" "strings" "sync" "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/memory" - "reasonix/internal/provider" - "reasonix/internal/skill" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" + "reasonix/internal/state/memory" ) // projectionHarness drives real turns through the real Build assembly against a diff --git a/internal/boot/costquote_order_test.go b/internal/assembly/boot/costquote_order_test.go similarity index 97% rename from internal/boot/costquote_order_test.go rename to internal/assembly/boot/costquote_order_test.go index 65be60634c..de5020f5f3 100644 --- a/internal/boot/costquote_order_test.go +++ b/internal/assembly/boot/costquote_order_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // offPeak pins these quotes to an hour DeepSeek bills at its base rate. Without diff --git a/internal/boot/costquote_wiring.go b/internal/assembly/boot/costquote_wiring.go similarity index 90% rename from internal/boot/costquote_wiring.go rename to internal/assembly/boot/costquote_wiring.go index 7721c8544a..b93f85cae9 100644 --- a/internal/boot/costquote_wiring.go +++ b/internal/assembly/boot/costquote_wiring.go @@ -2,10 +2,10 @@ package boot import ( - "reasonix/internal/billing" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/stats" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/model/billing" + "reasonix/internal/state/stats" ) // quotedSink wraps the frontend sink so every host consumer — stats recorder, diff --git a/internal/boot/credential_read_test.go b/internal/assembly/boot/credential_read_test.go similarity index 98% rename from internal/boot/credential_read_test.go rename to internal/assembly/boot/credential_read_test.go index cbb5a5fcd9..8521a4cc3c 100644 --- a/internal/boot/credential_read_test.go +++ b/internal/assembly/boot/credential_read_test.go @@ -12,9 +12,9 @@ import ( "sync" "testing" - "reasonix/internal/config" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/config" + "reasonix/internal/safety/sandbox" ) // The secret these tests plant. Asserting on the bytes rather than on an exit diff --git a/internal/boot/deepseek_protocol_migration.go b/internal/assembly/boot/deepseek_protocol_migration.go similarity index 97% rename from internal/boot/deepseek_protocol_migration.go rename to internal/assembly/boot/deepseek_protocol_migration.go index 216049c70c..f3f77adfc8 100644 --- a/internal/boot/deepseek_protocol_migration.go +++ b/internal/assembly/boot/deepseek_protocol_migration.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // handleConfigLoadWarnings puts the resilient loader's findings in front of diff --git a/internal/boot/deepseek_protocol_migration_test.go b/internal/assembly/boot/deepseek_protocol_migration_test.go similarity index 98% rename from internal/boot/deepseek_protocol_migration_test.go rename to internal/assembly/boot/deepseek_protocol_migration_test.go index f5b4c5e613..f0310ce0e3 100644 --- a/internal/boot/deepseek_protocol_migration_test.go +++ b/internal/assembly/boot/deepseek_protocol_migration_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/surface" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/surface" ) func TestBuildScopesMalformedConfigDeepSeekMigrationWarningToNonDesktopFrontends(t *testing.T) { diff --git a/internal/boot/delegation_audit_effect_test.go b/internal/assembly/boot/delegation_audit_effect_test.go similarity index 94% rename from internal/boot/delegation_audit_effect_test.go rename to internal/assembly/boot/delegation_audit_effect_test.go index d68dd83694..0df48fcabb 100644 --- a/internal/boot/delegation_audit_effect_test.go +++ b/internal/assembly/boot/delegation_audit_effect_test.go @@ -8,8 +8,8 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) type delegationAuditSink struct { diff --git a/internal/boot/delegation_identity_effect_test.go b/internal/assembly/boot/delegation_identity_effect_test.go similarity index 97% rename from internal/boot/delegation_identity_effect_test.go rename to internal/assembly/boot/delegation_identity_effect_test.go index 062c2a9a6b..634f678abc 100644 --- a/internal/boot/delegation_identity_effect_test.go +++ b/internal/assembly/boot/delegation_identity_effect_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // TestEffectProxiedDelegationArrivesNamed pins the identity at its final diff --git a/internal/boot/delegation_matrix_test.go b/internal/assembly/boot/delegation_matrix_test.go similarity index 97% rename from internal/boot/delegation_matrix_test.go rename to internal/assembly/boot/delegation_matrix_test.go index 20adca8ce4..ebb1dde204 100644 --- a/internal/boot/delegation_matrix_test.go +++ b/internal/assembly/boot/delegation_matrix_test.go @@ -9,16 +9,16 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/agentgraph" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/execgraph" - "reasonix/internal/execjournal" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/execgraph" + "reasonix/internal/state/execjournal" ) // The delegation matrix, frozen. A durable delegation is opened before it is diff --git a/internal/boot/delegation_tools.go b/internal/assembly/boot/delegation_tools.go similarity index 90% rename from internal/boot/delegation_tools.go rename to internal/assembly/boot/delegation_tools.go index d78711efac..cc3186d58f 100644 --- a/internal/boot/delegation_tools.go +++ b/internal/assembly/boot/delegation_tools.go @@ -1,8 +1,8 @@ package boot import ( - "reasonix/internal/agent" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // addDelegationTools registers every tool that spawns or reads a sub-agent. diff --git a/internal/boot/doctor_runtime.go b/internal/assembly/boot/doctor_runtime.go similarity index 98% rename from internal/boot/doctor_runtime.go rename to internal/assembly/boot/doctor_runtime.go index 34fd6d6505..ebe10875d5 100644 --- a/internal/boot/doctor_runtime.go +++ b/internal/assembly/boot/doctor_runtime.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) // RuntimeDoctorReport is the structured runtime diagnostics document for diff --git a/internal/boot/effect_browser_test.go b/internal/assembly/boot/effect_browser_test.go similarity index 97% rename from internal/boot/effect_browser_test.go rename to internal/assembly/boot/effect_browser_test.go index 3feb6b7ad2..d660d2d942 100644 --- a/internal/boot/effect_browser_test.go +++ b/internal/assembly/boot/effect_browser_test.go @@ -12,10 +12,10 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/permission" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" + "reasonix/internal/safety/permission" ) // browserScriptProvider plays a fixed browsing session: each round's call is diff --git a/internal/boot/effect_cache_tail_test.go b/internal/assembly/boot/effect_cache_tail_test.go similarity index 96% rename from internal/boot/effect_cache_tail_test.go rename to internal/assembly/boot/effect_cache_tail_test.go index 749d57d5bc..52c7e67933 100644 --- a/internal/boot/effect_cache_tail_test.go +++ b/internal/assembly/boot/effect_cache_tail_test.go @@ -6,9 +6,9 @@ import ( "sync" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // Through the real assembly: a turn that keeps a task list re-derives the diff --git a/internal/boot/effect_computer_test.go b/internal/assembly/boot/effect_computer_test.go similarity index 97% rename from internal/boot/effect_computer_test.go rename to internal/assembly/boot/effect_computer_test.go index be421070f2..19f5c7ac52 100644 --- a/internal/boot/effect_computer_test.go +++ b/internal/assembly/boot/effect_computer_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/evidence" - "reasonix/internal/permission" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" + "reasonix/internal/safety/permission" ) // fakeComputerHelperEnv makes the test binary answer as the native helper: one diff --git a/internal/boot/effect_extension_tool_test.go b/internal/assembly/boot/effect_extension_tool_test.go similarity index 95% rename from internal/boot/effect_extension_tool_test.go rename to internal/assembly/boot/effect_extension_tool_test.go index 20174febd3..2f1553a5b4 100644 --- a/internal/boot/effect_extension_tool_test.go +++ b/internal/assembly/boot/effect_extension_tool_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // A tool a plugin runtime serves reaches the model the way an MCP tool does: diff --git a/internal/boot/effect_test.go b/internal/assembly/boot/effect_test.go similarity index 98% rename from internal/boot/effect_test.go rename to internal/assembly/boot/effect_test.go index 5f8f06c5dc..c61a005263 100644 --- a/internal/boot/effect_test.go +++ b/internal/assembly/boot/effect_test.go @@ -16,14 +16,14 @@ import ( "testing" "time" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/memory" - "reasonix/internal/provider" - "reasonix/internal/surface" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" + "reasonix/internal/state/memory" ) type effectRecordingProvider struct { diff --git a/internal/boot/effect_tool_images_test.go b/internal/assembly/boot/effect_tool_images_test.go similarity index 97% rename from internal/boot/effect_tool_images_test.go rename to internal/assembly/boot/effect_tool_images_test.go index 0846cd8929..55b4f9b6f9 100644 --- a/internal/boot/effect_tool_images_test.go +++ b/internal/assembly/boot/effect_tool_images_test.go @@ -14,9 +14,9 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/plugin" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/plugin" ) // screenshotProvider asks for a screenshot every round until it has seen diff --git a/internal/boot/extension_dispatch_test.go b/internal/assembly/boot/extension_dispatch_test.go similarity index 99% rename from internal/boot/extension_dispatch_test.go rename to internal/assembly/boot/extension_dispatch_test.go index 96d7398db8..b45fa67de7 100644 --- a/internal/boot/extension_dispatch_test.go +++ b/internal/assembly/boot/extension_dispatch_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" + "reasonix/internal/contract/config" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" ) // Dispatch wiring tests: the boot builds the dispatcher, runs the diff --git a/internal/boot/extension_firstboot_test.go b/internal/assembly/boot/extension_firstboot_test.go similarity index 97% rename from internal/boot/extension_firstboot_test.go rename to internal/assembly/boot/extension_firstboot_test.go index 9a77368396..d664e71795 100644 --- a/internal/boot/extension_firstboot_test.go +++ b/internal/assembly/boot/extension_firstboot_test.go @@ -13,13 +13,13 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/providerext" - "reasonix/internal/extension/sidecar" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/providerext" + "reasonix/internal/ext/extension/sidecar" ) // First-boot coverage for extension-hosted providers: diff --git a/internal/boot/extension_provider_test.go b/internal/assembly/boot/extension_provider_test.go similarity index 98% rename from internal/boot/extension_provider_test.go rename to internal/assembly/boot/extension_provider_test.go index 34d6e1b366..35527dee0e 100644 --- a/internal/boot/extension_provider_test.go +++ b/internal/assembly/boot/extension_provider_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/extension/providerext" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/providerext" ) // End-to-end coverage: a fake sidecar declares and streams an diff --git a/internal/boot/extension_sidecar_test.go b/internal/assembly/boot/extension_sidecar_test.go similarity index 99% rename from internal/boot/extension_sidecar_test.go rename to internal/assembly/boot/extension_sidecar_test.go index bf444a33a3..3ed827c87f 100644 --- a/internal/boot/extension_sidecar_test.go +++ b/internal/assembly/boot/extension_sidecar_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/sidecar" - "reasonix/internal/pluginpkg" + "reasonix/internal/contract/config" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/pluginpkg" ) // Boot-level fake sidecar (re-exec helper-process pattern, mirroring the diff --git a/internal/boot/extension_tools.go b/internal/assembly/boot/extension_tools.go similarity index 96% rename from internal/boot/extension_tools.go rename to internal/assembly/boot/extension_tools.go index 80f4a3c3fa..5b678a5a03 100644 --- a/internal/boot/extension_tools.go +++ b/internal/assembly/boot/extension_tools.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "reasonix/internal/extension/sidecar" - "reasonix/internal/pluginpkg" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/pluginpkg" ) // ExtensionToolPrefix marks a tool a plugin runtime serves, the way mcp__ diff --git a/internal/boot/extension_ui_gate_test.go b/internal/assembly/boot/extension_ui_gate_test.go similarity index 98% rename from internal/boot/extension_ui_gate_test.go rename to internal/assembly/boot/extension_ui_gate_test.go index 5d2e3e3bd6..ca401e2def 100644 --- a/internal/boot/extension_ui_gate_test.go +++ b/internal/assembly/boot/extension_ui_gate_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // Deterministic coverage for gateExtensionUIRequest: a sidecar's startup diff --git a/internal/boot/extension_ui_test.go b/internal/assembly/boot/extension_ui_test.go similarity index 98% rename from internal/boot/extension_ui_test.go rename to internal/assembly/boot/extension_ui_test.go index 52f0a86cca..262c992fa6 100644 --- a/internal/boot/extension_ui_test.go +++ b/internal/assembly/boot/extension_ui_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/extension/protocol" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension/protocol" ) // uiSinkRecorder collects controller events for the stage-8a boot tests. diff --git a/internal/boot/generation_test.go b/internal/assembly/boot/generation_test.go similarity index 96% rename from internal/boot/generation_test.go rename to internal/assembly/boot/generation_test.go index 47c5a3211a..db70045d0d 100644 --- a/internal/boot/generation_test.go +++ b/internal/assembly/boot/generation_test.go @@ -3,7 +3,7 @@ package boot import ( "testing" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) // The one-time legacy upgrades are skipped for a build that continues a live diff --git a/internal/boot/goal_contract_effect_test.go b/internal/assembly/boot/goal_contract_effect_test.go similarity index 98% rename from internal/boot/goal_contract_effect_test.go rename to internal/assembly/boot/goal_contract_effect_test.go index bff700ec8f..c582ff0666 100644 --- a/internal/boot/goal_contract_effect_test.go +++ b/internal/assembly/boot/goal_contract_effect_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) func userTextOf(req provider.Request) string { diff --git a/internal/boot/goal_tool_surface_test.go b/internal/assembly/boot/goal_tool_surface_test.go similarity index 96% rename from internal/boot/goal_tool_surface_test.go rename to internal/assembly/boot/goal_tool_surface_test.go index c2911be208..74db0ebb7a 100644 --- a/internal/boot/goal_tool_surface_test.go +++ b/internal/assembly/boot/goal_tool_surface_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent/testutil" ) // TestGoalOnlyToolsLeaveTheSchemaWhenUnreachable is an effect test at the diff --git a/internal/boot/golden_baseline_test.go b/internal/assembly/boot/golden_baseline_test.go similarity index 97% rename from internal/boot/golden_baseline_test.go rename to internal/assembly/boot/golden_baseline_test.go index 1058f6aa90..a7235cc935 100644 --- a/internal/boot/golden_baseline_test.go +++ b/internal/assembly/boot/golden_baseline_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // Golden baseline for the unified extension kernel / Extension Protocol v2 @@ -28,13 +28,13 @@ import ( // deliberate, reviewed change to the provider-visible contract ever happens, // regenerate with: // -// REASONIX_UPDATE_GOLDEN=1 go test ./internal/boot -run TestGoldenBaseline -count=1 +// REASONIX_UPDATE_GOLDEN=1 go test ./internal/assembly/boot -run TestGoldenBaseline -count=1 // // and call the cache impact out in the commit message. // // Machine dependence is designed out of the golden: the environment probe // section is disabled in the fixture config (it embeds GOOS/GOARCH, shell -// labels, and probe output; internal/environment covers it with its own +// labels, and probe output; internal/platform/environment covers it with its own // snapshot tests), and the workspace root path is normalized to . const goldenBaselineDir = "testdata/golden" diff --git a/internal/boot/healthy_config.go b/internal/assembly/boot/healthy_config.go similarity index 96% rename from internal/boot/healthy_config.go rename to internal/assembly/boot/healthy_config.go index edf500267c..07770364db 100644 --- a/internal/boot/healthy_config.go +++ b/internal/assembly/boot/healthy_config.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "reasonix/internal/repair" + "reasonix/internal/platform/repair" ) // A successful assembly proves this user config usable. The retired Wails diff --git a/internal/boot/healthy_config_test.go b/internal/assembly/boot/healthy_config_test.go similarity index 99% rename from internal/boot/healthy_config_test.go rename to internal/assembly/boot/healthy_config_test.go index 9aefb4e9a2..efe1d86682 100644 --- a/internal/boot/healthy_config_test.go +++ b/internal/assembly/boot/healthy_config_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) func withRecorderSeam(t *testing.T, fn func(string) error) { diff --git a/internal/boot/helper_test.go b/internal/assembly/boot/helper_test.go similarity index 100% rename from internal/boot/helper_test.go rename to internal/assembly/boot/helper_test.go diff --git a/internal/boot/home_stated_effect_test.go b/internal/assembly/boot/home_stated_effect_test.go similarity index 97% rename from internal/boot/home_stated_effect_test.go rename to internal/assembly/boot/home_stated_effect_test.go index 38799bbf5d..0788808de9 100644 --- a/internal/boot/home_stated_effect_test.go +++ b/internal/assembly/boot/home_stated_effect_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // statedHomeWorkspace writes a project naming one provider kind whose key comes diff --git a/internal/boot/hook_notice.go b/internal/assembly/boot/hook_notice.go similarity index 92% rename from internal/boot/hook_notice.go rename to internal/assembly/boot/hook_notice.go index fd1951587a..ffb0ececd1 100644 --- a/internal/boot/hook_notice.go +++ b/internal/assembly/boot/hook_notice.go @@ -2,8 +2,8 @@ package boot import ( - "reasonix/internal/event" - "reasonix/internal/hook" + "reasonix/internal/contract/event" + "reasonix/internal/ext/hook" ) // hookNoticeEvent maps what a hook did onto the notice contract: a stable code diff --git a/internal/boot/install_source.go b/internal/assembly/boot/install_source.go similarity index 93% rename from internal/boot/install_source.go rename to internal/assembly/boot/install_source.go index 9b0de1d645..7ef8cbe3c5 100644 --- a/internal/boot/install_source.go +++ b/internal/assembly/boot/install_source.go @@ -5,11 +5,11 @@ import ( "io" "net/http" - "reasonix/internal/config" - "reasonix/internal/installsource" - "reasonix/internal/plugin" - "reasonix/internal/pluginspec" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/installsource" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/pluginspec" ) // addInstallSourceTool registers install_source, which installs an MCP server diff --git a/internal/boot/install_source_contract_test.go b/internal/assembly/boot/install_source_contract_test.go similarity index 97% rename from internal/boot/install_source_contract_test.go rename to internal/assembly/boot/install_source_contract_test.go index 999eb01eb3..d7883bb8b8 100644 --- a/internal/boot/install_source_contract_test.go +++ b/internal/assembly/boot/install_source_contract_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // The two-phase rule only binds the model if the model is told about it, and diff --git a/internal/boot/instructions_projection_test.go b/internal/assembly/boot/instructions_projection_test.go similarity index 98% rename from internal/boot/instructions_projection_test.go rename to internal/assembly/boot/instructions_projection_test.go index 831f9b936c..762a703be5 100644 --- a/internal/boot/instructions_projection_test.go +++ b/internal/assembly/boot/instructions_projection_test.go @@ -7,11 +7,11 @@ package boot import ( "os" "path/filepath" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" "strings" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) func writeInstructions(t *testing.T, dir, name, body string) { diff --git a/internal/boot/integration_matrix_test.go b/internal/assembly/boot/integration_matrix_test.go similarity index 95% rename from internal/boot/integration_matrix_test.go rename to internal/assembly/boot/integration_matrix_test.go index 5866434dfb..16345a0d8c 100644 --- a/internal/boot/integration_matrix_test.go +++ b/internal/assembly/boot/integration_matrix_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "reasonix/internal/extension" - "reasonix/internal/extension/sidecar" - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/extensioncontract" ) func TestIntegrationDrainTimeoutFiresCancel(t *testing.T) { diff --git a/internal/boot/integration_plan_test.go b/internal/assembly/boot/integration_plan_test.go similarity index 97% rename from internal/boot/integration_plan_test.go rename to internal/assembly/boot/integration_plan_test.go index 16592a3acc..a25f1bf19b 100644 --- a/internal/boot/integration_plan_test.go +++ b/internal/assembly/boot/integration_plan_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/extension" - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extensioncontract" ) func TestDoctorRuntimeReport(t *testing.T) { diff --git a/internal/boot/kimi_k3_test.go b/internal/assembly/boot/kimi_k3_test.go similarity index 96% rename from internal/boot/kimi_k3_test.go rename to internal/assembly/boot/kimi_k3_test.go index d7e5aaf9ac..385234724f 100644 --- a/internal/boot/kimi_k3_test.go +++ b/internal/assembly/boot/kimi_k3_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) func TestNewProviderAppliesExplicitKimiK3RequestContractToCustomGateway(t *testing.T) { diff --git a/internal/boot/main_test.go b/internal/assembly/boot/main_test.go similarity index 86% rename from internal/boot/main_test.go rename to internal/assembly/boot/main_test.go index e95da10443..656cde49af 100644 --- a/internal/boot/main_test.go +++ b/internal/assembly/boot/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestMain(m *testing.M) { diff --git a/internal/boot/mcp_specs.go b/internal/assembly/boot/mcp_specs.go similarity index 96% rename from internal/boot/mcp_specs.go rename to internal/assembly/boot/mcp_specs.go index dac37568e7..6fb281de37 100644 --- a/internal/boot/mcp_specs.go +++ b/internal/assembly/boot/mcp_specs.go @@ -3,9 +3,9 @@ package boot import ( "strings" - "reasonix/internal/config" - "reasonix/internal/plugin" - "reasonix/internal/pluginspec" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/pluginspec" ) // mcpSpecPlan is what a build resolves about MCP servers before any process is diff --git a/internal/boot/memoryset.go b/internal/assembly/boot/memoryset.go similarity index 92% rename from internal/boot/memoryset.go rename to internal/assembly/boot/memoryset.go index 46f80ceaa7..9b57c3bbbb 100644 --- a/internal/boot/memoryset.go +++ b/internal/assembly/boot/memoryset.go @@ -1,9 +1,9 @@ package boot import ( - "reasonix/internal/config" - "reasonix/internal/instruction" - "reasonix/internal/memory" + "reasonix/internal/contract/config" + "reasonix/internal/state/instruction" + "reasonix/internal/state/memory" ) // memoryAssembly is the memory surface for one build: the live set the remember diff --git a/internal/boot/model_error_test.go b/internal/assembly/boot/model_error_test.go similarity index 98% rename from internal/boot/model_error_test.go rename to internal/assembly/boot/model_error_test.go index 9f360c2481..c120f3049b 100644 --- a/internal/boot/model_error_test.go +++ b/internal/assembly/boot/model_error_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/event" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" - _ "reasonix/internal/provider/openai" - _ "reasonix/internal/tool/builtin" + _ "reasonix/internal/model/openai" + _ "reasonix/internal/tools/builtin" ) // TestBuildUnknownModelErrorIsActionable: a default_model that doesn't resolve diff --git a/internal/boot/options.go b/internal/assembly/boot/options.go similarity index 93% rename from internal/boot/options.go rename to internal/assembly/boot/options.go index 6394308934..d5fe467b23 100644 --- a/internal/boot/options.go +++ b/internal/assembly/boot/options.go @@ -4,20 +4,20 @@ import ( "io" "time" - "reasonix/internal/browser" - "reasonix/internal/config" + "reasonix/internal/contract/config" + "reasonix/internal/platform/browser" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/billing" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/plugin" - "reasonix/internal/provider" - "reasonix/internal/sessiontemp" - "reasonix/internal/surface" - "reasonix/internal/taskmonitor" - "reasonix/internal/tool/builtin" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/ext/plugin" + "reasonix/internal/model/billing" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/taskmonitor" + "reasonix/internal/session/control" + "reasonix/internal/state/sessiontemp" + "reasonix/internal/tools/builtin" ) // Options carries the per-run knobs a frontend chooses; everything else is read diff --git a/internal/boot/phasetimer.go b/internal/assembly/boot/phasetimer.go similarity index 100% rename from internal/boot/phasetimer.go rename to internal/assembly/boot/phasetimer.go diff --git a/internal/boot/pidprobe_unix_test.go b/internal/assembly/boot/pidprobe_unix_test.go similarity index 100% rename from internal/boot/pidprobe_unix_test.go rename to internal/assembly/boot/pidprobe_unix_test.go diff --git a/internal/boot/pidprobe_windows_test.go b/internal/assembly/boot/pidprobe_windows_test.go similarity index 100% rename from internal/boot/pidprobe_windows_test.go rename to internal/assembly/boot/pidprobe_windows_test.go diff --git a/internal/boot/planner_missing_test.go b/internal/assembly/boot/planner_missing_test.go similarity index 93% rename from internal/boot/planner_missing_test.go rename to internal/assembly/boot/planner_missing_test.go index e78f28cc9d..5b58a8c9b6 100644 --- a/internal/boot/planner_missing_test.go +++ b/internal/assembly/boot/planner_missing_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent/testutil" ) func TestBuildKeepsExecutorWhenPlannerModelIsUnresolvable(t *testing.T) { diff --git a/internal/boot/planner_override_test.go b/internal/assembly/boot/planner_override_test.go similarity index 89% rename from internal/boot/planner_override_test.go rename to internal/assembly/boot/planner_override_test.go index 0e587cfb10..744ece44fa 100644 --- a/internal/boot/planner_override_test.go +++ b/internal/assembly/boot/planner_override_test.go @@ -3,8 +3,8 @@ package boot import ( "testing" - "reasonix/internal/ablation" - "reasonix/internal/config" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/config" ) func TestPlannerOffHasHighestPrecedence(t *testing.T) { diff --git a/internal/boot/pluginspec.go b/internal/assembly/boot/pluginspec.go similarity index 92% rename from internal/boot/pluginspec.go rename to internal/assembly/boot/pluginspec.go index 189567bf62..e4844e2291 100644 --- a/internal/boot/pluginspec.go +++ b/internal/assembly/boot/pluginspec.go @@ -3,10 +3,10 @@ package boot import ( "strings" - "reasonix/internal/config" - "reasonix/internal/plugin" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" ) func partitionByTier(entries []config.PluginEntry) (eager, bg []config.PluginEntry) { diff --git a/internal/boot/prefix_boundary_effect_test.go b/internal/assembly/boot/prefix_boundary_effect_test.go similarity index 97% rename from internal/boot/prefix_boundary_effect_test.go rename to internal/assembly/boot/prefix_boundary_effect_test.go index 567a2290e6..0ec9b011ec 100644 --- a/internal/boot/prefix_boundary_effect_test.go +++ b/internal/assembly/boot/prefix_boundary_effect_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/event" - "reasonix/internal/memory" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/state/memory" ) // prefixProject builds a session in its own project and returns the system diff --git a/internal/boot/prompt.go b/internal/assembly/boot/prompt.go similarity index 93% rename from internal/boot/prompt.go rename to internal/assembly/boot/prompt.go index 2be618438f..2be3c441c0 100644 --- a/internal/boot/prompt.go +++ b/internal/assembly/boot/prompt.go @@ -2,18 +2,18 @@ package boot import ( "context" - "reasonix/internal/capability" + "reasonix/internal/runtime/capability" "runtime" "strings" - "reasonix/internal/config" - "reasonix/internal/environment" - "reasonix/internal/event" - "reasonix/internal/instruction" - "reasonix/internal/memory" - "reasonix/internal/outputstyle" - "reasonix/internal/sandbox" - "reasonix/internal/skill" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/ext/skill" + "reasonix/internal/platform/environment" + "reasonix/internal/runtime/outputstyle" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/instruction" + "reasonix/internal/state/memory" ) // promptAssembly is the cache-stable prefix a build composes once, together diff --git a/internal/boot/prompt_policy.go b/internal/assembly/boot/prompt_policy.go similarity index 94% rename from internal/boot/prompt_policy.go rename to internal/assembly/boot/prompt_policy.go index 030ece9035..ed3b86dddf 100644 --- a/internal/boot/prompt_policy.go +++ b/internal/assembly/boot/prompt_policy.go @@ -1,6 +1,6 @@ package boot -import "reasonix/internal/config" +import "reasonix/internal/contract/config" // corePolicies is every block appended to the base prompt at boot, in order. // One list so a policy cannot be added to the prefix without the tests that diff --git a/internal/boot/prompt_stability_test.go b/internal/assembly/boot/prompt_stability_test.go similarity index 96% rename from internal/boot/prompt_stability_test.go rename to internal/assembly/boot/prompt_stability_test.go index 014bdab6a0..4f22eb793b 100644 --- a/internal/boot/prompt_stability_test.go +++ b/internal/assembly/boot/prompt_stability_test.go @@ -13,7 +13,7 @@ import ( // unsorted iteration, time-dependent content) cold-starts the provider cache // for the whole machine, which is precisely the "desktop costs more" class // (#2945). Environment probes are covered cross-process by the persisted -// snapshot tests in internal/environment; this test pins the rest of the +// snapshot tests in internal/platform/environment; this test pins the rest of the // composition (memory, skills index, output style, workspace line, policies). func TestBuildComposesByteStableSystemPrompt(t *testing.T) { isolateConfigHome(t) diff --git a/internal/boot/provider_config.go b/internal/assembly/boot/provider_config.go similarity index 93% rename from internal/boot/provider_config.go rename to internal/assembly/boot/provider_config.go index 8e1886b273..ad174e1e9f 100644 --- a/internal/boot/provider_config.go +++ b/internal/assembly/boot/provider_config.go @@ -1,9 +1,9 @@ package boot import ( - "reasonix/internal/config" - "reasonix/internal/netclient" - "reasonix/internal/provider" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) // NewProviderWithProxy builds a provider.Provider with the configured ordinary diff --git a/internal/boot/rebuild_graph_test.go b/internal/assembly/boot/rebuild_graph_test.go similarity index 93% rename from internal/boot/rebuild_graph_test.go rename to internal/assembly/boot/rebuild_graph_test.go index 46a50f51d9..ef3ee134f1 100644 --- a/internal/boot/rebuild_graph_test.go +++ b/internal/assembly/boot/rebuild_graph_test.go @@ -3,8 +3,8 @@ package boot import ( "testing" - "reasonix/internal/extension" - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extensioncontract" ) func TestRebuildFromGraphUsesPreviousAsFrom(t *testing.T) { diff --git a/internal/boot/rebuild_subgraph.go b/internal/assembly/boot/rebuild_subgraph.go similarity index 96% rename from internal/boot/rebuild_subgraph.go rename to internal/assembly/boot/rebuild_subgraph.go index 2d66519717..8cbd67c2a7 100644 --- a/internal/boot/rebuild_subgraph.go +++ b/internal/assembly/boot/rebuild_subgraph.go @@ -5,14 +5,14 @@ import ( "fmt" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/sidecar" - "reasonix/internal/extension/uihub" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/extension/uihub" + "reasonix/internal/session/control" ) // tryRebuildSubgraph patches narrow plans without BuildRuntime (fail-atomic). diff --git a/internal/boot/reload.go b/internal/assembly/boot/reload.go similarity index 98% rename from internal/boot/reload.go rename to internal/assembly/boot/reload.go index bed1ed7f85..2cbde46924 100644 --- a/internal/boot/reload.go +++ b/internal/assembly/boot/reload.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/extension" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // Rebuild builds a replacement runtime for old, migrating session state. diff --git a/internal/boot/render_root_test.go b/internal/assembly/boot/render_root_test.go similarity index 91% rename from internal/boot/render_root_test.go rename to internal/assembly/boot/render_root_test.go index 65c7a7e88a..d261b3fbd7 100644 --- a/internal/boot/render_root_test.go +++ b/internal/assembly/boot/render_root_test.go @@ -3,8 +3,8 @@ package boot import ( "testing" - "reasonix/internal/browser" - "reasonix/internal/config" + "reasonix/internal/contract/config" + "reasonix/internal/platform/browser" ) // A look is owed only where one can be taken: a browser to open the page in and diff --git a/internal/boot/report.go b/internal/assembly/boot/report.go similarity index 92% rename from internal/boot/report.go rename to internal/assembly/boot/report.go index 1a66828913..25de827e08 100644 --- a/internal/boot/report.go +++ b/internal/assembly/boot/report.go @@ -1,6 +1,6 @@ package boot -import "reasonix/internal/event" +import "reasonix/internal/contract/event" // report is how assembly speaks: which model was chosen, which server failed to // start, which migration ran — none of it part of the conversation the runtime diff --git a/internal/boot/report_test.go b/internal/assembly/boot/report_test.go similarity index 100% rename from internal/boot/report_test.go rename to internal/assembly/boot/report_test.go diff --git a/internal/boot/resolver.go b/internal/assembly/boot/resolver.go similarity index 97% rename from internal/boot/resolver.go rename to internal/assembly/boot/resolver.go index 6ca6b38cfe..8d87ab6566 100644 --- a/internal/boot/resolver.go +++ b/internal/assembly/boot/resolver.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "reasonix/internal/config" - "reasonix/internal/extension" - "reasonix/internal/extension/providerext" - "reasonix/internal/extension/sidecar" - "reasonix/internal/netclient" - "reasonix/internal/provider" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/providerext" + "reasonix/internal/ext/extension/sidecar" ) // LocalProviderResolver preserves the historical config-backed provider path. diff --git a/internal/boot/resolver_remote_test.go b/internal/assembly/boot/resolver_remote_test.go similarity index 98% rename from internal/boot/resolver_remote_test.go rename to internal/assembly/boot/resolver_remote_test.go index d17feca353..fe3f275734 100644 --- a/internal/boot/resolver_remote_test.go +++ b/internal/assembly/boot/resolver_remote_test.go @@ -7,8 +7,8 @@ import ( "slices" "testing" - "reasonix/internal/config" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) func TestRemoteResolverMetadataOverridesHostProviderWithSameRef(t *testing.T) { diff --git a/internal/boot/review_obligation_test.go b/internal/assembly/boot/review_obligation_test.go similarity index 96% rename from internal/boot/review_obligation_test.go rename to internal/assembly/boot/review_obligation_test.go index e350993e4a..337a35722b 100644 --- a/internal/boot/review_obligation_test.go +++ b/internal/assembly/boot/review_obligation_test.go @@ -9,14 +9,14 @@ import ( "sync" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" ) // What a worker owes when it finishes is declared by whoever defined it, diff --git a/internal/boot/review_provenance_test.go b/internal/assembly/boot/review_provenance_test.go similarity index 98% rename from internal/boot/review_provenance_test.go rename to internal/assembly/boot/review_provenance_test.go index 5139ce8631..7bf91b4997 100644 --- a/internal/boot/review_provenance_test.go +++ b/internal/assembly/boot/review_provenance_test.go @@ -7,9 +7,9 @@ import ( "sync" "testing" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/skill" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/evidence" ) // Evidence that moves a durable decision has to be attributable to the run that diff --git a/internal/boot/runtime.go b/internal/assembly/boot/runtime.go similarity index 98% rename from internal/boot/runtime.go rename to internal/assembly/boot/runtime.go index a55be39995..31d1bc9eef 100644 --- a/internal/boot/runtime.go +++ b/internal/assembly/boot/runtime.go @@ -6,18 +6,18 @@ import ( "strings" "sync/atomic" - "reasonix/internal/command" - "reasonix/internal/control" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/sidecar" - "reasonix/internal/extension/uihub" - "reasonix/internal/hook" - "reasonix/internal/plugin" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/command" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/extension/uihub" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" ) // BuildResult is the full product of one runtime build: the ready-to-drive diff --git a/internal/boot/runtime_owner.go b/internal/assembly/boot/runtime_owner.go similarity index 93% rename from internal/boot/runtime_owner.go rename to internal/assembly/boot/runtime_owner.go index 396f26621c..0dcfcab48f 100644 --- a/internal/boot/runtime_owner.go +++ b/internal/assembly/boot/runtime_owner.go @@ -3,7 +3,7 @@ package boot import ( "context" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) func bindRuntimeOwner(ctx context.Context, opts Options) (context.Context, Options, *extension.RuntimeOwner, func(string, bool, []byte)) { diff --git a/internal/boot/runtime_owner_test.go b/internal/assembly/boot/runtime_owner_test.go similarity index 96% rename from internal/boot/runtime_owner_test.go rename to internal/assembly/boot/runtime_owner_test.go index e2c6cfdbed..680673b996 100644 --- a/internal/boot/runtime_owner_test.go +++ b/internal/assembly/boot/runtime_owner_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "reasonix/internal/control" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" + "reasonix/internal/session/control" ) func TestIndependentBuildRuntimeOwnersRemainActive(t *testing.T) { diff --git a/internal/boot/runtime_plan.go b/internal/assembly/boot/runtime_plan.go similarity index 97% rename from internal/boot/runtime_plan.go rename to internal/assembly/boot/runtime_plan.go index dc30f7780c..0390da091e 100644 --- a/internal/boot/runtime_plan.go +++ b/internal/assembly/boot/runtime_plan.go @@ -3,11 +3,11 @@ package boot import ( "strings" - "reasonix/internal/config" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/sidecar" - "reasonix/internal/extensioncontract" + "reasonix/internal/contract/config" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/extensioncontract" ) // RuntimeReload is previous-generation state for incremental sidecar adoption diff --git a/internal/boot/runtime_plan_test.go b/internal/assembly/boot/runtime_plan_test.go similarity index 96% rename from internal/boot/runtime_plan_test.go rename to internal/assembly/boot/runtime_plan_test.go index 2bc668cc09..b64fdd253d 100644 --- a/internal/boot/runtime_plan_test.go +++ b/internal/assembly/boot/runtime_plan_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/sidecar" - "reasonix/internal/extensioncontract" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/extensioncontract" ) func TestAttachPlanAndStatusObservesActualPrefixHash(t *testing.T) { diff --git a/internal/boot/runtime_test.go b/internal/assembly/boot/runtime_test.go similarity index 99% rename from internal/boot/runtime_test.go rename to internal/assembly/boot/runtime_test.go index 8527eafc5a..c0a55fcc44 100644 --- a/internal/boot/runtime_test.go +++ b/internal/assembly/boot/runtime_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "reasonix/internal/control" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) func TestBuildRuntimeDisablesImplicitSkillInvocation(t *testing.T) { diff --git a/internal/boot/schema_budget_test.go b/internal/assembly/boot/schema_budget_test.go similarity index 94% rename from internal/boot/schema_budget_test.go rename to internal/assembly/boot/schema_budget_test.go index 2ec245feff..3d6b2b0fc9 100644 --- a/internal/boot/schema_budget_test.go +++ b/internal/assembly/boot/schema_budget_test.go @@ -2,12 +2,12 @@ package boot import ( "encoding/json" - "reasonix/internal/ablation" + "reasonix/internal/contract/ablation" "sort" "testing" - "reasonix/internal/tokencount" - "reasonix/internal/tool" + "reasonix/internal/base/tokencount" + "reasonix/internal/contract/tool" ) // What a session is billed for before it does anything: the schemas the diff --git a/internal/boot/scope_wire.go b/internal/assembly/boot/scope_wire.go similarity index 89% rename from internal/boot/scope_wire.go rename to internal/assembly/boot/scope_wire.go index b66f296d2c..b191a8b35c 100644 --- a/internal/boot/scope_wire.go +++ b/internal/assembly/boot/scope_wire.go @@ -3,10 +3,10 @@ package boot import ( "context" - "reasonix/internal/extension" - "reasonix/internal/lsp" - "reasonix/internal/plugin" - "reasonix/internal/sessiontemp" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/plugin" + "reasonix/internal/platform/lsp" + "reasonix/internal/state/sessiontemp" ) // wireRuntimeScopeCleanup folds MCP host / LSP / session-temp inventory into diff --git a/internal/boot/session_observer.go b/internal/assembly/boot/session_observer.go similarity index 74% rename from internal/boot/session_observer.go rename to internal/assembly/boot/session_observer.go index 658126bcde..c6d869e1dc 100644 --- a/internal/boot/session_observer.go +++ b/internal/assembly/boot/session_observer.go @@ -1,8 +1,8 @@ package boot import ( - "reasonix/internal/agent" - "reasonix/internal/history" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/history" ) func newObservedSession(systemPrompt string) *agent.Session { diff --git a/internal/boot/session_runtime.go b/internal/assembly/boot/session_runtime.go similarity index 94% rename from internal/boot/session_runtime.go rename to internal/assembly/boot/session_runtime.go index c4875cf769..18b0772a0d 100644 --- a/internal/boot/session_runtime.go +++ b/internal/assembly/boot/session_runtime.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/jobs" - "reasonix/internal/workspacelease" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" + "reasonix/internal/session/control" + "reasonix/internal/state/workspacelease" ) // sessionRuntime is the session-scoped machinery a build hands to the diff --git a/internal/boot/session_temp_rebuild_test.go b/internal/assembly/boot/session_temp_rebuild_test.go similarity index 96% rename from internal/boot/session_temp_rebuild_test.go rename to internal/assembly/boot/session_temp_rebuild_test.go index d7891fe9a2..ca53cb16ea 100644 --- a/internal/boot/session_temp_rebuild_test.go +++ b/internal/assembly/boot/session_temp_rebuild_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/sessiontemp" + "reasonix/internal/contract/event" + "reasonix/internal/session/control" + "reasonix/internal/state/sessiontemp" ) func TestRebuildReusesSessionTempManager(t *testing.T) { diff --git a/internal/boot/side_models.go b/internal/assembly/boot/side_models.go similarity index 88% rename from internal/boot/side_models.go rename to internal/assembly/boot/side_models.go index 2bce1e463c..7b93ea128c 100644 --- a/internal/boot/side_models.go +++ b/internal/assembly/boot/side_models.go @@ -4,12 +4,12 @@ import ( "log/slog" "strings" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/goaleval" - "reasonix/internal/netclient" - "reasonix/internal/promptrefine" - "reasonix/internal/provider" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/goaleval" + "reasonix/internal/runtime/promptrefine" ) // goalEvaluator uses the same zero-config model fallback as the recovery diff --git a/internal/boot/skill_activation_test.go b/internal/assembly/boot/skill_activation_test.go similarity index 97% rename from internal/boot/skill_activation_test.go rename to internal/assembly/boot/skill_activation_test.go index 3527dcf7cc..ee01d0e963 100644 --- a/internal/boot/skill_activation_test.go +++ b/internal/assembly/boot/skill_activation_test.go @@ -11,10 +11,10 @@ import ( "sync" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) func TestActivationDecidesInvocationInTheSameSession(t *testing.T) { diff --git a/internal/boot/skill_catalog_effect_test.go b/internal/assembly/boot/skill_catalog_effect_test.go similarity index 95% rename from internal/boot/skill_catalog_effect_test.go rename to internal/assembly/boot/skill_catalog_effect_test.go index e43a3a64b4..41f2ca8c83 100644 --- a/internal/boot/skill_catalog_effect_test.go +++ b/internal/assembly/boot/skill_catalog_effect_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/ablation" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // catalogRun builds a project carrying one skill and returns the request that diff --git a/internal/boot/skill_execution_owner_test.go b/internal/assembly/boot/skill_execution_owner_test.go similarity index 96% rename from internal/boot/skill_execution_owner_test.go rename to internal/assembly/boot/skill_execution_owner_test.go index 04bebe672a..a7de71241d 100644 --- a/internal/boot/skill_execution_owner_test.go +++ b/internal/assembly/boot/skill_execution_owner_test.go @@ -6,14 +6,14 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/execjournal" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/execjournal" ) // A subagent skill is one delegated execution, so what it leaves behind is what diff --git a/internal/boot/skill_subagent.go b/internal/assembly/boot/skill_subagent.go similarity index 97% rename from internal/boot/skill_subagent.go rename to internal/assembly/boot/skill_subagent.go index 4505bc44e5..823fd7a727 100644 --- a/internal/boot/skill_subagent.go +++ b/internal/assembly/boot/skill_subagent.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/environment" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/platform/environment" + "reasonix/internal/runtime/agent" ) // skillSubagents runs a skill inside its own sub-agent loop: an isolated turn diff --git a/internal/boot/skills.go b/internal/assembly/boot/skills.go similarity index 97% rename from internal/boot/skills.go rename to internal/assembly/boot/skills.go index 93d6f82c89..7b5d29a89b 100644 --- a/internal/boot/skills.go +++ b/internal/assembly/boot/skills.go @@ -4,8 +4,8 @@ import ( "io" "strings" - "reasonix/internal/config" - "reasonix/internal/skill" + "reasonix/internal/contract/config" + "reasonix/internal/ext/skill" ) // skillAssembly is the discovered skill surface for one build: the policy-gated diff --git a/internal/boot/status_text.go b/internal/assembly/boot/status_text.go similarity index 98% rename from internal/boot/status_text.go rename to internal/assembly/boot/status_text.go index 7684d2a37a..bc58327f91 100644 --- a/internal/boot/status_text.go +++ b/internal/assembly/boot/status_text.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) // FormatRuntimeStatus renders a doctor-facing explanation of component diff --git a/internal/boot/stream_router_stage_test.go b/internal/assembly/boot/stream_router_stage_test.go similarity index 95% rename from internal/boot/stream_router_stage_test.go rename to internal/assembly/boot/stream_router_stage_test.go index 1857d796c9..c07dfdb962 100644 --- a/internal/boot/stream_router_stage_test.go +++ b/internal/assembly/boot/stream_router_stage_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/providerext" - "reasonix/internal/extension/sidecar" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/providerext" + "reasonix/internal/ext/extension/sidecar" ) type baseResolver struct{} diff --git a/internal/boot/subagent_ablation.go b/internal/assembly/boot/subagent_ablation.go similarity index 91% rename from internal/boot/subagent_ablation.go rename to internal/assembly/boot/subagent_ablation.go index c4fffa2e03..33a11818b5 100644 --- a/internal/boot/subagent_ablation.go +++ b/internal/assembly/boot/subagent_ablation.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "reasonix/internal/ablation" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" ) // gateSubagentArm refuses skills that would spawn a child while the subagent diff --git a/internal/boot/subagent_ablation_test.go b/internal/assembly/boot/subagent_ablation_test.go similarity index 98% rename from internal/boot/subagent_ablation_test.go rename to internal/assembly/boot/subagent_ablation_test.go index a307184da6..db5feffa05 100644 --- a/internal/boot/subagent_ablation_test.go +++ b/internal/assembly/boot/subagent_ablation_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/ablation" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" ) // The arm is only a control if it removes delegation whichever tool reaches it. diff --git a/internal/boot/subagent_cleanup_recovery_test.go b/internal/assembly/boot/subagent_cleanup_recovery_test.go similarity index 97% rename from internal/boot/subagent_cleanup_recovery_test.go rename to internal/assembly/boot/subagent_cleanup_recovery_test.go index 01e46b21b2..c4b9ff37fa 100644 --- a/internal/boot/subagent_cleanup_recovery_test.go +++ b/internal/assembly/boot/subagent_cleanup_recovery_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) func prepareRunningSubagent(t *testing.T, sessionDir string) string { diff --git a/internal/boot/subagent_config.go b/internal/assembly/boot/subagent_config.go similarity index 95% rename from internal/boot/subagent_config.go rename to internal/assembly/boot/subagent_config.go index 7c787502d5..0a0a0550e5 100644 --- a/internal/boot/subagent_config.go +++ b/internal/assembly/boot/subagent_config.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/netclient" - "reasonix/internal/provider" - "reasonix/internal/skill" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" ) // subagentConfig is what a build resolves about sub-agents before any of them diff --git a/internal/boot/subagent_model_test.go b/internal/assembly/boot/subagent_model_test.go similarity index 97% rename from internal/boot/subagent_model_test.go rename to internal/assembly/boot/subagent_model_test.go index fcba1a3887..efc52942fd 100644 --- a/internal/boot/subagent_model_test.go +++ b/internal/assembly/boot/subagent_model_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" ) type staticResolver struct { diff --git a/internal/boot/superseded_effect_test.go b/internal/assembly/boot/superseded_effect_test.go similarity index 97% rename from internal/boot/superseded_effect_test.go rename to internal/assembly/boot/superseded_effect_test.go index f83f5df8d9..82ad0e31e8 100644 --- a/internal/boot/superseded_effect_test.go +++ b/internal/assembly/boot/superseded_effect_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // isSummarizerRequest tells the compaction summarizer's own call apart from the diff --git a/internal/boot/switch_reuse_effect_test.go b/internal/assembly/boot/switch_reuse_effect_test.go similarity index 97% rename from internal/boot/switch_reuse_effect_test.go rename to internal/assembly/boot/switch_reuse_effect_test.go index 73a2d7427c..4d4ad06c68 100644 --- a/internal/boot/switch_reuse_effect_test.go +++ b/internal/assembly/boot/switch_reuse_effect_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // A model or effort switch rebuilds the runtime while reusing the serving diff --git a/internal/boot/system_prompt_file_test.go b/internal/assembly/boot/system_prompt_file_test.go similarity index 98% rename from internal/boot/system_prompt_file_test.go rename to internal/assembly/boot/system_prompt_file_test.go index 5055126458..d40adbeff4 100644 --- a/internal/boot/system_prompt_file_test.go +++ b/internal/assembly/boot/system_prompt_file_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) func TestBuildMissingSystemPromptFileFallsBackToInlinePrompt(t *testing.T) { diff --git a/internal/boot/systemone.go b/internal/assembly/boot/systemone.go similarity index 92% rename from internal/boot/systemone.go rename to internal/assembly/boot/systemone.go index 6fe2789a2f..3734eb0f4c 100644 --- a/internal/boot/systemone.go +++ b/internal/assembly/boot/systemone.go @@ -5,10 +5,10 @@ import ( "slices" "strings" - "reasonix/internal/config" - "reasonix/internal/laya" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/model/laya" + "reasonix/internal/tools/builtin" ) // addSystemOne wires the decision tool to whichever model the decision role diff --git a/internal/boot/task_budget.go b/internal/assembly/boot/task_budget.go similarity index 90% rename from internal/boot/task_budget.go rename to internal/assembly/boot/task_budget.go index 7b45f10e0b..99be117317 100644 --- a/internal/boot/task_budget.go +++ b/internal/assembly/boot/task_budget.go @@ -3,8 +3,8 @@ package boot import ( "time" - "reasonix/internal/agent" - "reasonix/internal/config" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" ) // taskBudgetFromConfig maps the configured spend gates onto the agent budget. diff --git a/internal/boot/task_budget_test.go b/internal/assembly/boot/task_budget_test.go similarity index 96% rename from internal/boot/task_budget_test.go rename to internal/assembly/boot/task_budget_test.go index 1509c52334..9377f1e9de 100644 --- a/internal/boot/task_budget_test.go +++ b/internal/assembly/boot/task_budget_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // Every axis ships off, so an unconfigured agent must reach the runtime with diff --git a/internal/boot/temphelper_test.go b/internal/assembly/boot/temphelper_test.go similarity index 92% rename from internal/boot/temphelper_test.go rename to internal/assembly/boot/temphelper_test.go index 111adb41f2..9339defc02 100644 --- a/internal/boot/temphelper_test.go +++ b/internal/assembly/boot/temphelper_test.go @@ -3,7 +3,7 @@ package boot import ( "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // robustTempDir is the name boot's call sites already use for testenv.TempDir, diff --git a/internal/boot/testdata/golden/prefix_shape.json b/internal/assembly/boot/testdata/golden/prefix_shape.json similarity index 100% rename from internal/boot/testdata/golden/prefix_shape.json rename to internal/assembly/boot/testdata/golden/prefix_shape.json diff --git a/internal/boot/testdata/golden/provider_request.json b/internal/assembly/boot/testdata/golden/provider_request.json similarity index 100% rename from internal/boot/testdata/golden/provider_request.json rename to internal/assembly/boot/testdata/golden/provider_request.json diff --git a/internal/boot/testdata/golden/system_prompt.txt b/internal/assembly/boot/testdata/golden/system_prompt.txt similarity index 100% rename from internal/boot/testdata/golden/system_prompt.txt rename to internal/assembly/boot/testdata/golden/system_prompt.txt diff --git a/internal/boot/testdata/golden/tool_schemas.json b/internal/assembly/boot/testdata/golden/tool_schemas.json similarity index 100% rename from internal/boot/testdata/golden/tool_schemas.json rename to internal/assembly/boot/testdata/golden/tool_schemas.json diff --git a/internal/boot/token_profile.go b/internal/assembly/boot/token_profile.go similarity index 100% rename from internal/boot/token_profile.go rename to internal/assembly/boot/token_profile.go diff --git a/internal/boot/tool_contract_surface_test.go b/internal/assembly/boot/tool_contract_surface_test.go similarity index 99% rename from internal/boot/tool_contract_surface_test.go rename to internal/assembly/boot/tool_contract_surface_test.go index ee290d3c6f..e97c3f7bf0 100644 --- a/internal/boot/tool_contract_surface_test.go +++ b/internal/assembly/boot/tool_contract_surface_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // unifiedBootToolNames is the provider-visible surface shared by every Agent diff --git a/internal/boot/tool_issuer_test.go b/internal/assembly/boot/tool_issuer_test.go similarity index 98% rename from internal/boot/tool_issuer_test.go rename to internal/assembly/boot/tool_issuer_test.go index 8f2f147d76..a3944592c4 100644 --- a/internal/boot/tool_issuer_test.go +++ b/internal/assembly/boot/tool_issuer_test.go @@ -6,8 +6,8 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // issuerProvider answers with one model tool call, then finishes. It also diff --git a/internal/boot/triage.go b/internal/assembly/boot/triage.go similarity index 91% rename from internal/boot/triage.go rename to internal/assembly/boot/triage.go index ec3ceacd58..39f2cfafe3 100644 --- a/internal/boot/triage.go +++ b/internal/assembly/boot/triage.go @@ -4,9 +4,9 @@ import ( "log/slog" "strings" - "reasonix/internal/config" - "reasonix/internal/netclient" - "reasonix/internal/provider" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) // resolveTriage builds the model that answers host classifications the static diff --git a/internal/boot/turn_exit_tools.go b/internal/assembly/boot/turn_exit_tools.go similarity index 91% rename from internal/boot/turn_exit_tools.go rename to internal/assembly/boot/turn_exit_tools.go index 9e069ee073..8d7f7715f5 100644 --- a/internal/boot/turn_exit_tools.go +++ b/internal/assembly/boot/turn_exit_tools.go @@ -1,8 +1,8 @@ package boot import ( - "reasonix/internal/agent" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // addTurnExitTools registers the three ways a turn ends on the model's terms: a diff --git a/internal/boot/usage_record_effect_test.go b/internal/assembly/boot/usage_record_effect_test.go similarity index 95% rename from internal/boot/usage_record_effect_test.go rename to internal/assembly/boot/usage_record_effect_test.go index 96928d8434..fcdc9b1703 100644 --- a/internal/boot/usage_record_effect_test.go +++ b/internal/assembly/boot/usage_record_effect_test.go @@ -5,11 +5,11 @@ import ( "sync" "testing" - "reasonix/internal/agent" - "reasonix/internal/doctor" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/usagereport" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/frontend/doctor" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/usagereport" ) // usageReportingProvider answers every round with a cache split, so a test can diff --git a/internal/boot/use_capability_surface_test.go b/internal/assembly/boot/use_capability_surface_test.go similarity index 97% rename from internal/boot/use_capability_surface_test.go rename to internal/assembly/boot/use_capability_surface_test.go index d10246ca2f..0e2a0b2679 100644 --- a/internal/boot/use_capability_surface_test.go +++ b/internal/assembly/boot/use_capability_surface_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent/testutil" ) func TestUnifiedSurfaceExposesUseCapabilityForAllRoleSettings(t *testing.T) { diff --git a/internal/boot/window_posture.go b/internal/assembly/boot/window_posture.go similarity index 88% rename from internal/boot/window_posture.go rename to internal/assembly/boot/window_posture.go index 8400929180..a68f920790 100644 --- a/internal/boot/window_posture.go +++ b/internal/assembly/boot/window_posture.go @@ -2,9 +2,9 @@ package boot import ( - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/surface" + "reasonix/internal/contract/config" + "reasonix/internal/contract/surface" + "reasonix/internal/session/control" ) // withWindowPosture hands back the controller in the posture its config names. diff --git a/internal/boot/work_practice_test.go b/internal/assembly/boot/work_practice_test.go similarity index 98% rename from internal/boot/work_practice_test.go rename to internal/assembly/boot/work_practice_test.go index e2548cc36e..e87994a502 100644 --- a/internal/boot/work_practice_test.go +++ b/internal/assembly/boot/work_practice_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func TestBuildAppendsWorkPracticePolicyToCustomSystemPrompt(t *testing.T) { diff --git a/internal/boot/workspace.go b/internal/assembly/boot/workspace.go similarity index 100% rename from internal/boot/workspace.go rename to internal/assembly/boot/workspace.go diff --git a/internal/boot/workspace_lease_effect_test.go b/internal/assembly/boot/workspace_lease_effect_test.go similarity index 96% rename from internal/boot/workspace_lease_effect_test.go rename to internal/assembly/boot/workspace_lease_effect_test.go index ddf25f5651..5bd3440c9f 100644 --- a/internal/boot/workspace_lease_effect_test.go +++ b/internal/assembly/boot/workspace_lease_effect_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/workspacelease" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/state/workspacelease" ) // A process a session leaves running — a dev server, a watcher — used to hold diff --git a/internal/boot/workspace_root_test.go b/internal/assembly/boot/workspace_root_test.go similarity index 100% rename from internal/boot/workspace_root_test.go rename to internal/assembly/boot/workspace_root_test.go diff --git a/internal/boot/zz_probe3_test.go b/internal/assembly/boot/zz_probe3_test.go similarity index 96% rename from internal/boot/zz_probe3_test.go rename to internal/assembly/boot/zz_probe3_test.go index dd8df1b33f..57983adfdb 100644 --- a/internal/boot/zz_probe3_test.go +++ b/internal/assembly/boot/zz_probe3_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) type failingOnceProvider struct { diff --git a/internal/diff/diff.go b/internal/base/diff/diff.go similarity index 100% rename from internal/diff/diff.go rename to internal/base/diff/diff.go diff --git a/internal/diff/diff_extra_test.go b/internal/base/diff/diff_extra_test.go similarity index 100% rename from internal/diff/diff_extra_test.go rename to internal/base/diff/diff_extra_test.go diff --git a/internal/diff/diff_test.go b/internal/base/diff/diff_test.go similarity index 100% rename from internal/diff/diff_test.go rename to internal/base/diff/diff_test.go diff --git a/internal/diff/largediff_test.go b/internal/base/diff/largediff_test.go similarity index 100% rename from internal/diff/largediff_test.go rename to internal/base/diff/largediff_test.go diff --git a/internal/filelock/filelock.go b/internal/base/filelock/filelock.go similarity index 100% rename from internal/filelock/filelock.go rename to internal/base/filelock/filelock.go diff --git a/internal/filelock/filelock_test.go b/internal/base/filelock/filelock_test.go similarity index 98% rename from internal/filelock/filelock_test.go rename to internal/base/filelock/filelock_test.go index 3c8b52f2d6..4f18830a6b 100644 --- a/internal/filelock/filelock_test.go +++ b/internal/base/filelock/filelock_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func registrySize() int { diff --git a/internal/filelock/lock_unix.go b/internal/base/filelock/lock_unix.go similarity index 100% rename from internal/filelock/lock_unix.go rename to internal/base/filelock/lock_unix.go diff --git a/internal/filelock/lock_windows.go b/internal/base/filelock/lock_windows.go similarity index 100% rename from internal/filelock/lock_windows.go rename to internal/base/filelock/lock_windows.go diff --git a/internal/fileref/search.go b/internal/base/fileref/search.go similarity index 100% rename from internal/fileref/search.go rename to internal/base/fileref/search.go diff --git a/internal/fileref/search_test.go b/internal/base/fileref/search_test.go similarity index 99% rename from internal/fileref/search_test.go rename to internal/base/fileref/search_test.go index fa442e9569..f21ad0163e 100644 --- a/internal/fileref/search_test.go +++ b/internal/base/fileref/search_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // writeFile is a tiny helper that creates a regular file with placeholder diff --git a/internal/fileref/skip_test.go b/internal/base/fileref/skip_test.go similarity index 97% rename from internal/fileref/skip_test.go rename to internal/base/fileref/skip_test.go index 434d89ef49..3d53b277d8 100644 --- a/internal/fileref/skip_test.go +++ b/internal/base/fileref/skip_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestSkipEntryHidesBuildOutputDirectories(t *testing.T) { diff --git a/internal/fileutil/atomicwrite.go b/internal/base/fileutil/atomicwrite.go similarity index 100% rename from internal/fileutil/atomicwrite.go rename to internal/base/fileutil/atomicwrite.go diff --git a/internal/fileutil/atomicwrite_test.go b/internal/base/fileutil/atomicwrite_test.go similarity index 99% rename from internal/fileutil/atomicwrite_test.go rename to internal/base/fileutil/atomicwrite_test.go index 777bf4f506..ed2ccf2169 100644 --- a/internal/fileutil/atomicwrite_test.go +++ b/internal/base/fileutil/atomicwrite_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // claimRenameForTest renames without the cross-device copy fallback, the shape diff --git a/internal/fileutil/containment.go b/internal/base/fileutil/containment.go similarity index 100% rename from internal/fileutil/containment.go rename to internal/base/fileutil/containment.go diff --git a/internal/fileutil/containment_test.go b/internal/base/fileutil/containment_test.go similarity index 100% rename from internal/fileutil/containment_test.go rename to internal/base/fileutil/containment_test.go diff --git a/internal/fileutil/encoding/encoding.go b/internal/base/fileutil/encoding/encoding.go similarity index 100% rename from internal/fileutil/encoding/encoding.go rename to internal/base/fileutil/encoding/encoding.go diff --git a/internal/fileutil/encoding/encoding_test.go b/internal/base/fileutil/encoding/encoding_test.go similarity index 99% rename from internal/fileutil/encoding/encoding_test.go rename to internal/base/fileutil/encoding/encoding_test.go index 44f65246a0..4afed4056a 100644 --- a/internal/fileutil/encoding/encoding_test.go +++ b/internal/base/fileutil/encoding/encoding_test.go @@ -10,7 +10,7 @@ import ( "unicode/utf16" "golang.org/x/text/encoding/simplifiedchinese" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // Detect diff --git a/internal/fileutil/encoding/trim_partial_rune_test.go b/internal/base/fileutil/encoding/trim_partial_rune_test.go similarity index 100% rename from internal/fileutil/encoding/trim_partial_rune_test.go rename to internal/base/fileutil/encoding/trim_partial_rune_test.go diff --git a/internal/fileutil/replacefallback_other.go b/internal/base/fileutil/replacefallback_other.go similarity index 100% rename from internal/fileutil/replacefallback_other.go rename to internal/base/fileutil/replacefallback_other.go diff --git a/internal/fileutil/replacefallback_windows.go b/internal/base/fileutil/replacefallback_windows.go similarity index 100% rename from internal/fileutil/replacefallback_windows.go rename to internal/base/fileutil/replacefallback_windows.go diff --git a/internal/fileutil/replacefallback_windows_test.go b/internal/base/fileutil/replacefallback_windows_test.go similarity index 100% rename from internal/fileutil/replacefallback_windows_test.go rename to internal/base/fileutil/replacefallback_windows_test.go diff --git a/internal/fileutil/rootname.go b/internal/base/fileutil/rootname.go similarity index 100% rename from internal/fileutil/rootname.go rename to internal/base/fileutil/rootname.go diff --git a/internal/fileutil/rootname_test.go b/internal/base/fileutil/rootname_test.go similarity index 100% rename from internal/fileutil/rootname_test.go rename to internal/base/fileutil/rootname_test.go diff --git a/internal/fileutil/slashglob.go b/internal/base/fileutil/slashglob.go similarity index 100% rename from internal/fileutil/slashglob.go rename to internal/base/fileutil/slashglob.go diff --git a/internal/fileutil/slashglob_test.go b/internal/base/fileutil/slashglob_test.go similarity index 100% rename from internal/fileutil/slashglob_test.go rename to internal/base/fileutil/slashglob_test.go diff --git a/internal/fileutil/vcs.go b/internal/base/fileutil/vcs.go similarity index 100% rename from internal/fileutil/vcs.go rename to internal/base/fileutil/vcs.go diff --git a/internal/frontmatter/document.go b/internal/base/frontmatter/document.go similarity index 100% rename from internal/frontmatter/document.go rename to internal/base/frontmatter/document.go diff --git a/internal/frontmatter/document_test.go b/internal/base/frontmatter/document_test.go similarity index 100% rename from internal/frontmatter/document_test.go rename to internal/base/frontmatter/document_test.go diff --git a/internal/frontmatter/frontmatter.go b/internal/base/frontmatter/frontmatter.go similarity index 100% rename from internal/frontmatter/frontmatter.go rename to internal/base/frontmatter/frontmatter.go diff --git a/internal/frontmatter/frontmatter_test.go b/internal/base/frontmatter/frontmatter_test.go similarity index 100% rename from internal/frontmatter/frontmatter_test.go rename to internal/base/frontmatter/frontmatter_test.go diff --git a/internal/frontmatter/list_test.go b/internal/base/frontmatter/list_test.go similarity index 100% rename from internal/frontmatter/list_test.go rename to internal/base/frontmatter/list_test.go diff --git a/internal/gitignore/excludes.go b/internal/base/gitignore/excludes.go similarity index 100% rename from internal/gitignore/excludes.go rename to internal/base/gitignore/excludes.go diff --git a/internal/gitignore/gitignore.go b/internal/base/gitignore/gitignore.go similarity index 100% rename from internal/gitignore/gitignore.go rename to internal/base/gitignore/gitignore.go diff --git a/internal/gitignore/gitignore_test.go b/internal/base/gitignore/gitignore_test.go similarity index 94% rename from internal/gitignore/gitignore_test.go rename to internal/base/gitignore/gitignore_test.go index 8a2415d6c9..d26e133e16 100644 --- a/internal/gitignore/gitignore_test.go +++ b/internal/base/gitignore/gitignore_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) // gb18030Lines is the kind of reader a caller supplies when the ignore files on diff --git a/internal/i18n/catalog_parity_test.go b/internal/base/i18n/catalog_parity_test.go similarity index 100% rename from internal/i18n/catalog_parity_test.go rename to internal/base/i18n/catalog_parity_test.go diff --git a/internal/i18n/catalog_test.go b/internal/base/i18n/catalog_test.go similarity index 100% rename from internal/i18n/catalog_test.go rename to internal/base/i18n/catalog_test.go diff --git a/internal/i18n/i18n.go b/internal/base/i18n/i18n.go similarity index 100% rename from internal/i18n/i18n.go rename to internal/base/i18n/i18n.go diff --git a/internal/i18n/i18n_test.go b/internal/base/i18n/i18n_test.go similarity index 100% rename from internal/i18n/i18n_test.go rename to internal/base/i18n/i18n_test.go diff --git a/internal/i18n/messages_en.go b/internal/base/i18n/messages_en.go similarity index 100% rename from internal/i18n/messages_en.go rename to internal/base/i18n/messages_en.go diff --git a/internal/i18n/messages_zh.go b/internal/base/i18n/messages_zh.go similarity index 100% rename from internal/i18n/messages_zh.go rename to internal/base/i18n/messages_zh.go diff --git a/internal/i18n/messages_zh_tw.go b/internal/base/i18n/messages_zh_tw.go similarity index 100% rename from internal/i18n/messages_zh_tw.go rename to internal/base/i18n/messages_zh_tw.go diff --git a/internal/i18n/oslang_other.go b/internal/base/i18n/oslang_other.go similarity index 100% rename from internal/i18n/oslang_other.go rename to internal/base/i18n/oslang_other.go diff --git a/internal/i18n/oslang_windows.go b/internal/base/i18n/oslang_windows.go similarity index 100% rename from internal/i18n/oslang_windows.go rename to internal/base/i18n/oslang_windows.go diff --git a/internal/netclient/diagnose.go b/internal/base/netclient/diagnose.go similarity index 100% rename from internal/netclient/diagnose.go rename to internal/base/netclient/diagnose.go diff --git a/internal/netclient/diagnose_test.go b/internal/base/netclient/diagnose_test.go similarity index 100% rename from internal/netclient/diagnose_test.go rename to internal/base/netclient/diagnose_test.go diff --git a/internal/netclient/dialer.go b/internal/base/netclient/dialer.go similarity index 100% rename from internal/netclient/dialer.go rename to internal/base/netclient/dialer.go diff --git a/internal/netclient/netclient.go b/internal/base/netclient/netclient.go similarity index 99% rename from internal/netclient/netclient.go rename to internal/base/netclient/netclient.go index a466fa9602..a9b5a85414 100644 --- a/internal/netclient/netclient.go +++ b/internal/base/netclient/netclient.go @@ -15,7 +15,7 @@ import ( "golang.org/x/net/http/httpproxy" - "reasonix/internal/sysproxy" + "reasonix/internal/base/sysproxy" ) const ( diff --git a/internal/netclient/netclient_test.go b/internal/base/netclient/netclient_test.go similarity index 100% rename from internal/netclient/netclient_test.go rename to internal/base/netclient/netclient_test.go diff --git a/internal/neterr/errno_unix.go b/internal/base/neterr/errno_unix.go similarity index 100% rename from internal/neterr/errno_unix.go rename to internal/base/neterr/errno_unix.go diff --git a/internal/neterr/errno_windows.go b/internal/base/neterr/errno_windows.go similarity index 100% rename from internal/neterr/errno_windows.go rename to internal/base/neterr/errno_windows.go diff --git a/internal/neterr/neterr.go b/internal/base/neterr/neterr.go similarity index 100% rename from internal/neterr/neterr.go rename to internal/base/neterr/neterr.go diff --git a/internal/neterr/neterr_test.go b/internal/base/neterr/neterr_test.go similarity index 100% rename from internal/neterr/neterr_test.go rename to internal/base/neterr/neterr_test.go diff --git a/internal/nilutil/nil.go b/internal/base/nilutil/nil.go similarity index 100% rename from internal/nilutil/nil.go rename to internal/base/nilutil/nil.go diff --git a/internal/nilutil/nil_test.go b/internal/base/nilutil/nil_test.go similarity index 100% rename from internal/nilutil/nil_test.go rename to internal/base/nilutil/nil_test.go diff --git a/internal/proc/hide_other.go b/internal/base/proc/hide_other.go similarity index 100% rename from internal/proc/hide_other.go rename to internal/base/proc/hide_other.go diff --git a/internal/proc/hide_other_test.go b/internal/base/proc/hide_other_test.go similarity index 100% rename from internal/proc/hide_other_test.go rename to internal/base/proc/hide_other_test.go diff --git a/internal/proc/hide_windows.go b/internal/base/proc/hide_windows.go similarity index 100% rename from internal/proc/hide_windows.go rename to internal/base/proc/hide_windows.go diff --git a/internal/proc/hide_windows_test.go b/internal/base/proc/hide_windows_test.go similarity index 100% rename from internal/proc/hide_windows_test.go rename to internal/base/proc/hide_windows_test.go diff --git a/internal/proc/kill_other.go b/internal/base/proc/kill_other.go similarity index 100% rename from internal/proc/kill_other.go rename to internal/base/proc/kill_other.go diff --git a/internal/proc/kill_other_test.go b/internal/base/proc/kill_other_test.go similarity index 100% rename from internal/proc/kill_other_test.go rename to internal/base/proc/kill_other_test.go diff --git a/internal/proc/kill_windows.go b/internal/base/proc/kill_windows.go similarity index 100% rename from internal/proc/kill_windows.go rename to internal/base/proc/kill_windows.go diff --git a/internal/proc/kill_windows_test.go b/internal/base/proc/kill_windows_test.go similarity index 100% rename from internal/proc/kill_windows_test.go rename to internal/base/proc/kill_windows_test.go diff --git a/internal/proc/priority_other.go b/internal/base/proc/priority_other.go similarity index 100% rename from internal/proc/priority_other.go rename to internal/base/proc/priority_other.go diff --git a/internal/proc/priority_windows.go b/internal/base/proc/priority_windows.go similarity index 100% rename from internal/proc/priority_windows.go rename to internal/base/proc/priority_windows.go diff --git a/internal/proc/priority_windows_test.go b/internal/base/proc/priority_windows_test.go similarity index 100% rename from internal/proc/priority_windows_test.go rename to internal/base/proc/priority_windows_test.go diff --git a/internal/proc/run.go b/internal/base/proc/run.go similarity index 100% rename from internal/proc/run.go rename to internal/base/proc/run.go diff --git a/internal/proc/run_test.go b/internal/base/proc/run_test.go similarity index 100% rename from internal/proc/run_test.go rename to internal/base/proc/run_test.go diff --git a/internal/proc/shell_path_probe_other.go b/internal/base/proc/shell_path_probe_other.go similarity index 100% rename from internal/proc/shell_path_probe_other.go rename to internal/base/proc/shell_path_probe_other.go diff --git a/internal/proc/shell_path_probe_windows.go b/internal/base/proc/shell_path_probe_windows.go similarity index 100% rename from internal/proc/shell_path_probe_windows.go rename to internal/base/proc/shell_path_probe_windows.go diff --git a/internal/proc/tracked.go b/internal/base/proc/tracked.go similarity index 100% rename from internal/proc/tracked.go rename to internal/base/proc/tracked.go diff --git a/internal/proc/tracked_test.go b/internal/base/proc/tracked_test.go similarity index 100% rename from internal/proc/tracked_test.go rename to internal/base/proc/tracked_test.go diff --git a/internal/proc/tree_other.go b/internal/base/proc/tree_other.go similarity index 100% rename from internal/proc/tree_other.go rename to internal/base/proc/tree_other.go diff --git a/internal/proc/tree_windows.go b/internal/base/proc/tree_windows.go similarity index 100% rename from internal/proc/tree_windows.go rename to internal/base/proc/tree_windows.go diff --git a/internal/proc/tree_windows_test.go b/internal/base/proc/tree_windows_test.go similarity index 100% rename from internal/proc/tree_windows_test.go rename to internal/base/proc/tree_windows_test.go diff --git a/internal/retrieval/bm25.go b/internal/base/retrieval/bm25.go similarity index 100% rename from internal/retrieval/bm25.go rename to internal/base/retrieval/bm25.go diff --git a/internal/retrieval/bm25_test.go b/internal/base/retrieval/bm25_test.go similarity index 100% rename from internal/retrieval/bm25_test.go rename to internal/base/retrieval/bm25_test.go diff --git a/internal/retrieval/v2.go b/internal/base/retrieval/v2.go similarity index 100% rename from internal/retrieval/v2.go rename to internal/base/retrieval/v2.go diff --git a/internal/retrieval/v2_test.go b/internal/base/retrieval/v2_test.go similarity index 100% rename from internal/retrieval/v2_test.go rename to internal/base/retrieval/v2_test.go diff --git a/internal/secrets/credpaths.go b/internal/base/secrets/credpaths.go similarity index 100% rename from internal/secrets/credpaths.go rename to internal/base/secrets/credpaths.go diff --git a/internal/secrets/credpaths_test.go b/internal/base/secrets/credpaths_test.go similarity index 100% rename from internal/secrets/credpaths_test.go rename to internal/base/secrets/credpaths_test.go diff --git a/internal/secrets/redact.go b/internal/base/secrets/redact.go similarity index 99% rename from internal/secrets/redact.go rename to internal/base/secrets/redact.go index 25fbfbef5e..d5743f6175 100644 --- a/internal/secrets/redact.go +++ b/internal/base/secrets/redact.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) var ( diff --git a/internal/secrets/redact_test.go b/internal/base/secrets/redact_test.go similarity index 99% rename from internal/secrets/redact_test.go rename to internal/base/secrets/redact_test.go index 70eaf38924..bf2a82345a 100644 --- a/internal/secrets/redact_test.go +++ b/internal/base/secrets/redact_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestRedactMasksCommonSecretShapes(t *testing.T) { diff --git a/internal/shellparse/bash.go b/internal/base/shellparse/bash.go similarity index 100% rename from internal/shellparse/bash.go rename to internal/base/shellparse/bash.go diff --git a/internal/shellparse/bash_test.go b/internal/base/shellparse/bash_test.go similarity index 100% rename from internal/shellparse/bash_test.go rename to internal/base/shellparse/bash_test.go diff --git a/internal/shellparse/exit_status.go b/internal/base/shellparse/exit_status.go similarity index 100% rename from internal/shellparse/exit_status.go rename to internal/base/shellparse/exit_status.go diff --git a/internal/shellparse/heredoc.go b/internal/base/shellparse/heredoc.go similarity index 100% rename from internal/shellparse/heredoc.go rename to internal/base/shellparse/heredoc.go diff --git a/internal/shellparse/heredoc_scope_test.go b/internal/base/shellparse/heredoc_scope_test.go similarity index 100% rename from internal/shellparse/heredoc_scope_test.go rename to internal/base/shellparse/heredoc_scope_test.go diff --git a/internal/shellparse/mask_test.go b/internal/base/shellparse/mask_test.go similarity index 100% rename from internal/shellparse/mask_test.go rename to internal/base/shellparse/mask_test.go diff --git a/internal/shellparse/pipeline.go b/internal/base/shellparse/pipeline.go similarity index 100% rename from internal/shellparse/pipeline.go rename to internal/base/shellparse/pipeline.go diff --git a/internal/shellparse/pipeline_test.go b/internal/base/shellparse/pipeline_test.go similarity index 100% rename from internal/shellparse/pipeline_test.go rename to internal/base/shellparse/pipeline_test.go diff --git a/internal/sysproxy/sysproxy.go b/internal/base/sysproxy/sysproxy.go similarity index 100% rename from internal/sysproxy/sysproxy.go rename to internal/base/sysproxy/sysproxy.go diff --git a/internal/sysproxy/sysproxy_test.go b/internal/base/sysproxy/sysproxy_test.go similarity index 100% rename from internal/sysproxy/sysproxy_test.go rename to internal/base/sysproxy/sysproxy_test.go diff --git a/internal/sysproxy/system_other.go b/internal/base/sysproxy/system_other.go similarity index 100% rename from internal/sysproxy/system_other.go rename to internal/base/sysproxy/system_other.go diff --git a/internal/sysproxy/system_windows.go b/internal/base/sysproxy/system_windows.go similarity index 100% rename from internal/sysproxy/system_windows.go rename to internal/base/sysproxy/system_windows.go diff --git a/internal/tempdir/refusal_other.go b/internal/base/tempdir/refusal_other.go similarity index 100% rename from internal/tempdir/refusal_other.go rename to internal/base/tempdir/refusal_other.go diff --git a/internal/tempdir/refusal_windows.go b/internal/base/tempdir/refusal_windows.go similarity index 100% rename from internal/tempdir/refusal_windows.go rename to internal/base/tempdir/refusal_windows.go diff --git a/internal/tempdir/refusal_windows_test.go b/internal/base/tempdir/refusal_windows_test.go similarity index 100% rename from internal/tempdir/refusal_windows_test.go rename to internal/base/tempdir/refusal_windows_test.go diff --git a/internal/tempdir/tempdir.go b/internal/base/tempdir/tempdir.go similarity index 100% rename from internal/tempdir/tempdir.go rename to internal/base/tempdir/tempdir.go diff --git a/internal/tempdir/tempdir_test.go b/internal/base/tempdir/tempdir_test.go similarity index 100% rename from internal/tempdir/tempdir_test.go rename to internal/base/tempdir/tempdir_test.go diff --git a/internal/testenv/budget.go b/internal/base/testenv/budget.go similarity index 100% rename from internal/testenv/budget.go rename to internal/base/testenv/budget.go diff --git a/internal/testenv/home.go b/internal/base/testenv/home.go similarity index 100% rename from internal/testenv/home.go rename to internal/base/testenv/home.go diff --git a/internal/testenv/home_test.go b/internal/base/testenv/home_test.go similarity index 100% rename from internal/testenv/home_test.go rename to internal/base/testenv/home_test.go diff --git a/internal/testenv/tempdir.go b/internal/base/testenv/tempdir.go similarity index 100% rename from internal/testenv/tempdir.go rename to internal/base/testenv/tempdir.go diff --git a/internal/textutil/bytes.go b/internal/base/textutil/bytes.go similarity index 100% rename from internal/textutil/bytes.go rename to internal/base/textutil/bytes.go diff --git a/internal/textutil/display.go b/internal/base/textutil/display.go similarity index 100% rename from internal/textutil/display.go rename to internal/base/textutil/display.go diff --git a/internal/textutil/grapheme.go b/internal/base/textutil/grapheme.go similarity index 100% rename from internal/textutil/grapheme.go rename to internal/base/textutil/grapheme.go diff --git a/internal/textutil/grapheme_test.go b/internal/base/textutil/grapheme_test.go similarity index 100% rename from internal/textutil/grapheme_test.go rename to internal/base/textutil/grapheme_test.go diff --git a/internal/tokencount/tokencount.go b/internal/base/tokencount/tokencount.go similarity index 100% rename from internal/tokencount/tokencount.go rename to internal/base/tokencount/tokencount.go diff --git a/internal/tokencount/tokencount_test.go b/internal/base/tokencount/tokencount_test.go similarity index 100% rename from internal/tokencount/tokencount_test.go rename to internal/base/tokencount/tokencount_test.go diff --git a/internal/workspaceid/workspaceid.go b/internal/base/workspaceid/workspaceid.go similarity index 100% rename from internal/workspaceid/workspaceid.go rename to internal/base/workspaceid/workspaceid.go diff --git a/internal/workspaceid/workspaceid_test.go b/internal/base/workspaceid/workspaceid_test.go similarity index 99% rename from internal/workspaceid/workspaceid_test.go rename to internal/base/workspaceid/workspaceid_test.go index 9f3d89d00c..e4d9179f4f 100644 --- a/internal/workspaceid/workspaceid_test.go +++ b/internal/base/workspaceid/workspaceid_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func sharesRepo(a, b string) bool { diff --git a/internal/ablation/ablation.go b/internal/contract/ablation/ablation.go similarity index 100% rename from internal/ablation/ablation.go rename to internal/contract/ablation/ablation.go diff --git a/internal/ablation/ablation_test.go b/internal/contract/ablation/ablation_test.go similarity index 100% rename from internal/ablation/ablation_test.go rename to internal/contract/ablation/ablation_test.go diff --git a/internal/agentgraph/doc.go b/internal/contract/agentgraph/doc.go similarity index 100% rename from internal/agentgraph/doc.go rename to internal/contract/agentgraph/doc.go diff --git a/internal/agentgraph/graph.go b/internal/contract/agentgraph/graph.go similarity index 100% rename from internal/agentgraph/graph.go rename to internal/contract/agentgraph/graph.go diff --git a/internal/agentgraph/graph_test.go b/internal/contract/agentgraph/graph_test.go similarity index 100% rename from internal/agentgraph/graph_test.go rename to internal/contract/agentgraph/graph_test.go diff --git a/internal/agentpreset/matrix_test.go b/internal/contract/agentpreset/matrix_test.go similarity index 95% rename from internal/agentpreset/matrix_test.go rename to internal/contract/agentpreset/matrix_test.go index 45b9480713..c291639319 100644 --- a/internal/agentpreset/matrix_test.go +++ b/internal/contract/agentpreset/matrix_test.go @@ -3,8 +3,8 @@ package agentpreset_test import ( "testing" - "reasonix/internal/agentpreset" - "reasonix/internal/taskpolicy" + "reasonix/internal/contract/agentpreset" + "reasonix/internal/runtime/taskpolicy" ) // TestRoleSettingMatrix locks the product contract for the two role settings: diff --git a/internal/agentpreset/policy.go b/internal/contract/agentpreset/policy.go similarity index 100% rename from internal/agentpreset/policy.go rename to internal/contract/agentpreset/policy.go diff --git a/internal/agentpreset/preset.go b/internal/contract/agentpreset/preset.go similarity index 100% rename from internal/agentpreset/preset.go rename to internal/contract/agentpreset/preset.go diff --git a/internal/agentpreset/preset_test.go b/internal/contract/agentpreset/preset_test.go similarity index 100% rename from internal/agentpreset/preset_test.go rename to internal/contract/agentpreset/preset_test.go diff --git a/internal/config/activation_mcp.go b/internal/contract/config/activation_mcp.go similarity index 100% rename from internal/config/activation_mcp.go rename to internal/contract/config/activation_mcp.go diff --git a/internal/config/activation_skill.go b/internal/contract/config/activation_skill.go similarity index 100% rename from internal/config/activation_skill.go rename to internal/contract/config/activation_skill.go diff --git a/internal/config/activation_trust_test.go b/internal/contract/config/activation_trust_test.go similarity index 100% rename from internal/config/activation_trust_test.go rename to internal/contract/config/activation_trust_test.go diff --git a/internal/config/agent_roundtrip_test.go b/internal/contract/config/agent_roundtrip_test.go similarity index 98% rename from internal/config/agent_roundtrip_test.go rename to internal/contract/config/agent_roundtrip_test.go index 2fda39f183..0034ef42c4 100644 --- a/internal/config/agent_roundtrip_test.go +++ b/internal/contract/config/agent_roundtrip_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // Keys the loader deliberately drops: retired knobs kept only so an old TOML diff --git a/internal/config/anthropic_contract.go b/internal/contract/config/anthropic_contract.go similarity index 97% rename from internal/config/anthropic_contract.go rename to internal/contract/config/anthropic_contract.go index 8e2d739de6..227b00b82a 100644 --- a/internal/config/anthropic_contract.go +++ b/internal/contract/config/anthropic_contract.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" + "reasonix/internal/contract/provider" + "reasonix/internal/model/openai" ) // isAnthropicDepthEntry reports whether an Anthropic-kind endpoint implements diff --git a/internal/config/apikeyenv.go b/internal/contract/config/apikeyenv.go similarity index 100% rename from internal/config/apikeyenv.go rename to internal/contract/config/apikeyenv.go diff --git a/internal/config/apikeyenv_test.go b/internal/contract/config/apikeyenv_test.go similarity index 100% rename from internal/config/apikeyenv_test.go rename to internal/contract/config/apikeyenv_test.go diff --git a/internal/config/appearance_round_trip_test.go b/internal/contract/config/appearance_round_trip_test.go similarity index 98% rename from internal/config/appearance_round_trip_test.go rename to internal/contract/config/appearance_round_trip_test.go index 833cb2584b..4266229f83 100644 --- a/internal/config/appearance_round_trip_test.go +++ b/internal/contract/config/appearance_round_trip_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // render.go is hand-written, so a field it does not know about is dropped on diff --git a/internal/config/backfill_test.go b/internal/contract/config/backfill_test.go similarity index 99% rename from internal/config/backfill_test.go rename to internal/contract/config/backfill_test.go index 743d848a80..40bf5c9d01 100644 --- a/internal/config/backfill_test.go +++ b/internal/contract/config/backfill_test.go @@ -10,8 +10,8 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) func hasModel(c *Config, model string) *ProviderEntry { diff --git a/internal/config/billing.go b/internal/contract/config/billing.go similarity index 99% rename from internal/config/billing.go rename to internal/contract/config/billing.go index 5e63c2a04d..279a2781ec 100644 --- a/internal/config/billing.go +++ b/internal/contract/config/billing.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/billing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // BillingConfig controls host-side cost display. It never changes provider diff --git a/internal/config/billing_test.go b/internal/contract/config/billing_test.go similarity index 94% rename from internal/config/billing_test.go rename to internal/contract/config/billing_test.go index a2e9c10dd3..fcf2adbc77 100644 --- a/internal/config/billing_test.go +++ b/internal/contract/config/billing_test.go @@ -3,8 +3,8 @@ package config import ( "testing" - "reasonix/internal/billing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) func TestDisplayCurrencyIndependentOfListPrices(t *testing.T) { diff --git a/internal/config/billing_upgrade_test.go b/internal/contract/config/billing_upgrade_test.go similarity index 97% rename from internal/config/billing_upgrade_test.go rename to internal/contract/config/billing_upgrade_test.go index 5bbf010a5e..2c8d26804c 100644 --- a/internal/config/billing_upgrade_test.go +++ b/internal/contract/config/billing_upgrade_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestBillingSplitUpgradeV5ToV6FreezesProviderCurrency(t *testing.T) { diff --git a/internal/config/bounded_component_test.go b/internal/contract/config/bounded_component_test.go similarity index 100% rename from internal/config/bounded_component_test.go rename to internal/contract/config/bounded_component_test.go diff --git a/internal/config/bringforward.go b/internal/contract/config/bringforward.go similarity index 100% rename from internal/config/bringforward.go rename to internal/contract/config/bringforward.go diff --git a/internal/config/browser.go b/internal/contract/config/browser.go similarity index 100% rename from internal/config/browser.go rename to internal/contract/config/browser.go diff --git a/internal/config/cache_policy.go b/internal/contract/config/cache_policy.go similarity index 100% rename from internal/config/cache_policy.go rename to internal/contract/config/cache_policy.go diff --git a/internal/config/cache_policy_test.go b/internal/contract/config/cache_policy_test.go similarity index 100% rename from internal/config/cache_policy_test.go rename to internal/contract/config/cache_policy_test.go diff --git a/internal/config/capability_activation.go b/internal/contract/config/capability_activation.go similarity index 98% rename from internal/config/capability_activation.go rename to internal/contract/config/capability_activation.go index 79a6e5feb4..b7b989d046 100644 --- a/internal/config/capability_activation.go +++ b/internal/contract/config/capability_activation.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "reasonix/internal/filelock" - "reasonix/internal/fileutil" - "reasonix/internal/mcplaunch" - "reasonix/internal/workspaceid" + "reasonix/internal/base/filelock" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/workspaceid" + "reasonix/internal/ext/mcplaunch" ) // Install authorizes a capability; this file only records what is currently on diff --git a/internal/config/capability_activation_test.go b/internal/contract/config/capability_activation_test.go similarity index 99% rename from internal/config/capability_activation_test.go rename to internal/contract/config/capability_activation_test.go index 029f935c92..023225ad39 100644 --- a/internal/config/capability_activation_test.go +++ b/internal/contract/config/capability_activation_test.go @@ -9,8 +9,8 @@ import ( "sync" "testing" - "reasonix/internal/mcplaunch" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/mcplaunch" ) func TestActivationStoreDefaultsAndOverrides(t *testing.T) { diff --git a/internal/config/capability_errors.go b/internal/contract/config/capability_errors.go similarity index 100% rename from internal/config/capability_errors.go rename to internal/contract/config/capability_errors.go diff --git a/internal/config/ccswitch.go b/internal/contract/config/ccswitch.go similarity index 98% rename from internal/config/ccswitch.go rename to internal/contract/config/ccswitch.go index 7129d73812..b82a032b1d 100644 --- a/internal/config/ccswitch.go +++ b/internal/contract/config/ccswitch.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/secrets" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/secrets" ) const ccSwitchDir = ".cc-switch" diff --git a/internal/config/ccswitch_test.go b/internal/contract/config/ccswitch_test.go similarity index 99% rename from internal/config/ccswitch_test.go rename to internal/contract/config/ccswitch_test.go index 9f2727a567..5d6982ad70 100644 --- a/internal/config/ccswitch_test.go +++ b/internal/contract/config/ccswitch_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestCCSwitchRowsToPlugins(t *testing.T) { diff --git a/internal/config/chat_model.go b/internal/contract/config/chat_model.go similarity index 100% rename from internal/config/chat_model.go rename to internal/contract/config/chat_model.go diff --git a/internal/config/chat_model_test.go b/internal/contract/config/chat_model_test.go similarity index 100% rename from internal/config/chat_model_test.go rename to internal/contract/config/chat_model_test.go diff --git a/internal/config/claudejson.go b/internal/contract/config/claudejson.go similarity index 98% rename from internal/config/claudejson.go rename to internal/contract/config/claudejson.go index b8ae102e59..8086abb7ae 100644 --- a/internal/config/claudejson.go +++ b/internal/contract/config/claudejson.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // Claude Code writes MCP servers to three places, and .mcp.json — the only one diff --git a/internal/config/claudejson_test.go b/internal/contract/config/claudejson_test.go similarity index 100% rename from internal/config/claudejson_test.go rename to internal/contract/config/claudejson_test.go diff --git a/internal/config/cli_update_channel_test.go b/internal/contract/config/cli_update_channel_test.go similarity index 98% rename from internal/config/cli_update_channel_test.go rename to internal/contract/config/cli_update_channel_test.go index c8b43a3d7d..1db983e934 100644 --- a/internal/config/cli_update_channel_test.go +++ b/internal/contract/config/cli_update_channel_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestCLIUpdateChannelDefaultsAndValidation(t *testing.T) { diff --git a/internal/config/commanddirs_test.go b/internal/contract/config/commanddirs_test.go similarity index 100% rename from internal/config/commanddirs_test.go rename to internal/contract/config/commanddirs_test.go diff --git a/internal/config/config.go b/internal/contract/config/config.go similarity index 99% rename from internal/config/config.go rename to internal/contract/config/config.go index 151571caa5..393c700a73 100644 --- a/internal/config/config.go +++ b/internal/contract/config/config.go @@ -13,8 +13,8 @@ import ( "slices" "strings" - "reasonix/internal/netclient" - "reasonix/internal/provider" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/provider" ) // Config is Reasonix's runtime configuration. @@ -1427,7 +1427,7 @@ type ShellConfig struct { } // PermissionsConfig declares the per-call permission policy (see -// internal/permission). Mode is the fallback decision for writer tools when no +// internal/safety/permission). Mode is the fallback decision for writer tools when no // rule matches ("ask" | "allow" | "deny"; default "ask"); read-only tools always // fall back to allow. Allow/Ask/Deny are rule lists of the form "ToolName" or // "ToolName(glob)". Precedence: deny > ask > allow > fallback. diff --git a/internal/config/configured_test.go b/internal/contract/config/configured_test.go similarity index 100% rename from internal/config/configured_test.go rename to internal/contract/config/configured_test.go diff --git a/internal/config/credentials.go b/internal/contract/config/credentials.go similarity index 99% rename from internal/config/credentials.go rename to internal/contract/config/credentials.go index 8c7108b514..5f28ad40a1 100644 --- a/internal/config/credentials.go +++ b/internal/contract/config/credentials.go @@ -13,8 +13,8 @@ import ( "github.com/joho/godotenv" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" ) const ( diff --git a/internal/config/credentials_keyring_default.go b/internal/contract/config/credentials_keyring_default.go similarity index 100% rename from internal/config/credentials_keyring_default.go rename to internal/contract/config/credentials_keyring_default.go diff --git a/internal/config/credentials_keyring_helper.go b/internal/contract/config/credentials_keyring_helper.go similarity index 100% rename from internal/config/credentials_keyring_helper.go rename to internal/contract/config/credentials_keyring_helper.go diff --git a/internal/config/credentials_keyring_timeout_test.go b/internal/contract/config/credentials_keyring_timeout_test.go similarity index 99% rename from internal/config/credentials_keyring_timeout_test.go rename to internal/contract/config/credentials_keyring_timeout_test.go index 6a81af5745..149dcee2f1 100644 --- a/internal/config/credentials_keyring_timeout_test.go +++ b/internal/contract/config/credentials_keyring_timeout_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestLookupLegacyKeyringBatchInProcessFourState(t *testing.T) { diff --git a/internal/config/credentials_keyring_unix.go b/internal/contract/config/credentials_keyring_unix.go similarity index 100% rename from internal/config/credentials_keyring_unix.go rename to internal/contract/config/credentials_keyring_unix.go diff --git a/internal/config/credentials_location_test.go b/internal/contract/config/credentials_location_test.go similarity index 97% rename from internal/config/credentials_location_test.go rename to internal/contract/config/credentials_location_test.go index dd2054c737..70e1451cf7 100644 --- a/internal/config/credentials_location_test.go +++ b/internal/contract/config/credentials_location_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // The location a missing-key error names must be the file resolution actually diff --git a/internal/config/curated_models.go b/internal/contract/config/curated_models.go similarity index 100% rename from internal/config/curated_models.go rename to internal/contract/config/curated_models.go diff --git a/internal/config/decode.go b/internal/contract/config/decode.go similarity index 97% rename from internal/config/decode.go rename to internal/contract/config/decode.go index 0328ef183d..4a37a9143f 100644 --- a/internal/config/decode.go +++ b/internal/contract/config/decode.go @@ -5,7 +5,7 @@ import ( "github.com/BurntSushi/toml" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) func decodeTOMLFile(path string, v any) (toml.MetaData, error) { diff --git a/internal/config/deepseek_canonical.go b/internal/contract/config/deepseek_canonical.go similarity index 99% rename from internal/config/deepseek_canonical.go rename to internal/contract/config/deepseek_canonical.go index f890507479..7ab4d0a346 100644 --- a/internal/config/deepseek_canonical.go +++ b/internal/contract/config/deepseek_canonical.go @@ -4,7 +4,7 @@ package config import ( "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // canonicalizeOfficialDeepSeekSource folds deepseek-flash and deepseek-pro into diff --git a/internal/config/deepseek_catalog.go b/internal/contract/config/deepseek_catalog.go similarity index 99% rename from internal/config/deepseek_catalog.go rename to internal/contract/config/deepseek_catalog.go index 11527889f2..688bcd9872 100644 --- a/internal/config/deepseek_catalog.go +++ b/internal/contract/config/deepseek_catalog.go @@ -3,7 +3,7 @@ package config import ( "strings" - "reasonix/internal/billing" + "reasonix/internal/model/billing" ) // The vendor folded its Flash names into one model that reads images, so a diff --git a/internal/config/deepseek_catalog_test.go b/internal/contract/config/deepseek_catalog_test.go similarity index 99% rename from internal/config/deepseek_catalog_test.go rename to internal/contract/config/deepseek_catalog_test.go index 2fe1d43c15..a1f6dd0e71 100644 --- a/internal/config/deepseek_catalog_test.go +++ b/internal/contract/config/deepseek_catalog_test.go @@ -4,7 +4,7 @@ import ( "slices" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // An installed user's model list is frozen in their config file. The vendor diff --git a/internal/config/deepseek_peer_fold_test.go b/internal/contract/config/deepseek_peer_fold_test.go similarity index 99% rename from internal/config/deepseek_peer_fold_test.go rename to internal/contract/config/deepseek_peer_fold_test.go index 34ba3997e8..893e41d6e7 100644 --- a/internal/config/deepseek_peer_fold_test.go +++ b/internal/contract/config/deepseek_peer_fold_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // The shape a real config lands in: an OpenAI "deepseek" entry the user added, diff --git a/internal/config/deepseek_presets.go b/internal/contract/config/deepseek_presets.go similarity index 100% rename from internal/config/deepseek_presets.go rename to internal/contract/config/deepseek_presets.go diff --git a/internal/config/deepseek_protocol_migration.go b/internal/contract/config/deepseek_protocol_migration.go similarity index 99% rename from internal/config/deepseek_protocol_migration.go rename to internal/contract/config/deepseek_protocol_migration.go index 1d6649b7b4..5dbfa85767 100644 --- a/internal/config/deepseek_protocol_migration.go +++ b/internal/contract/config/deepseek_protocol_migration.go @@ -12,8 +12,8 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" ) const deepSeekOfficialBalanceURL = "https://api.deepseek.com/user/balance" diff --git a/internal/config/deepseek_protocol_migration_test.go b/internal/contract/config/deepseek_protocol_migration_test.go similarity index 99% rename from internal/config/deepseek_protocol_migration_test.go rename to internal/contract/config/deepseek_protocol_migration_test.go index 515ad78db1..72d6a6c38f 100644 --- a/internal/config/deepseek_protocol_migration_test.go +++ b/internal/contract/config/deepseek_protocol_migration_test.go @@ -11,8 +11,8 @@ import ( "github.com/BurntSushi/toml" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func TestMigrateLegacyDeepSeekProtocolUserConfigPreservesTOMLAndIsIdempotent(t *testing.T) { diff --git a/internal/config/deepseek_vision_fold.go b/internal/contract/config/deepseek_vision_fold.go similarity index 100% rename from internal/config/deepseek_vision_fold.go rename to internal/contract/config/deepseek_vision_fold.go diff --git a/internal/config/deepseek_vision_fold_test.go b/internal/contract/config/deepseek_vision_fold_test.go similarity index 97% rename from internal/config/deepseek_vision_fold_test.go rename to internal/contract/config/deepseek_vision_fold_test.go index dc8572da13..f4f891af2f 100644 --- a/internal/config/deepseek_vision_fold_test.go +++ b/internal/contract/config/deepseek_vision_fold_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) // The vision connection existed because reading an image needed a model of its diff --git a/internal/config/default_test.go b/internal/contract/config/default_test.go similarity index 100% rename from internal/config/default_test.go rename to internal/contract/config/default_test.go diff --git a/internal/config/delivery_paths_test.go b/internal/contract/config/delivery_paths_test.go similarity index 98% rename from internal/config/delivery_paths_test.go rename to internal/contract/config/delivery_paths_test.go index b101eca06d..51dbaec67a 100644 --- a/internal/config/delivery_paths_test.go +++ b/internal/contract/config/delivery_paths_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestDeliveryWorktreeDirUsesLocalAppDataOnWindows(t *testing.T) { diff --git a/internal/config/desktop_config.go b/internal/contract/config/desktop_config.go similarity index 100% rename from internal/config/desktop_config.go rename to internal/contract/config/desktop_config.go diff --git a/internal/config/desktop_pin.go b/internal/contract/config/desktop_pin.go similarity index 100% rename from internal/config/desktop_pin.go rename to internal/contract/config/desktop_pin.go diff --git a/internal/config/desktop_roundtrip_test.go b/internal/contract/config/desktop_roundtrip_test.go similarity index 100% rename from internal/config/desktop_roundtrip_test.go rename to internal/contract/config/desktop_roundtrip_test.go diff --git a/internal/config/dotenv.go b/internal/contract/config/dotenv.go similarity index 98% rename from internal/config/dotenv.go rename to internal/contract/config/dotenv.go index a9189f7056..9e682b813a 100644 --- a/internal/config/dotenv.go +++ b/internal/contract/config/dotenv.go @@ -9,7 +9,7 @@ import ( "github.com/joho/godotenv" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) type dotEnvFile struct { diff --git a/internal/config/dotenv_test.go b/internal/contract/config/dotenv_test.go similarity index 99% rename from internal/config/dotenv_test.go rename to internal/contract/config/dotenv_test.go index c7125575de..e2747d0c9f 100644 --- a/internal/config/dotenv_test.go +++ b/internal/contract/config/dotenv_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func TestLoadDotEnvDoesNotImportProjectOrHomeEnv(t *testing.T) { diff --git a/internal/config/edit.go b/internal/contract/config/edit.go similarity index 99% rename from internal/config/edit.go rename to internal/contract/config/edit.go index b78f7ee0da..db42d9ff32 100644 --- a/internal/config/edit.go +++ b/internal/contract/config/edit.go @@ -14,12 +14,12 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/mcpdiag" - "reasonix/internal/netclient" - "reasonix/internal/permission" - "reasonix/internal/provider" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/mcpdiag" + "reasonix/internal/safety/permission" ) var validDesktopExternalOpenerID = regexp.MustCompile(`^[a-z0-9][a-z0-9._-]{0,63}$`) diff --git a/internal/config/edit_compaction.go b/internal/contract/config/edit_compaction.go similarity index 100% rename from internal/config/edit_compaction.go rename to internal/contract/config/edit_compaction.go diff --git a/internal/config/edit_shell.go b/internal/contract/config/edit_shell.go similarity index 100% rename from internal/config/edit_shell.go rename to internal/contract/config/edit_shell.go diff --git a/internal/config/edit_test.go b/internal/contract/config/edit_test.go similarity index 99% rename from internal/config/edit_test.go rename to internal/contract/config/edit_test.go index 5da56f1fda..2ee2c1a1fa 100644 --- a/internal/config/edit_test.go +++ b/internal/contract/config/edit_test.go @@ -16,8 +16,8 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) // The configuration is one catalog of two. An extension-hosted model lives in diff --git a/internal/config/effort.go b/internal/contract/config/effort.go similarity index 99% rename from internal/config/effort.go rename to internal/contract/config/effort.go index 41e09153a7..88aa56b467 100644 --- a/internal/config/effort.go +++ b/internal/contract/config/effort.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "reasonix/internal/provider/openai" + "reasonix/internal/model/openai" ) const ( diff --git a/internal/config/effort_gpt56_test.go b/internal/contract/config/effort_gpt56_test.go similarity index 100% rename from internal/config/effort_gpt56_test.go rename to internal/contract/config/effort_gpt56_test.go diff --git a/internal/config/effort_mimo_test.go b/internal/contract/config/effort_mimo_test.go similarity index 100% rename from internal/config/effort_mimo_test.go rename to internal/contract/config/effort_mimo_test.go diff --git a/internal/config/effort_protocol.go b/internal/contract/config/effort_protocol.go similarity index 100% rename from internal/config/effort_protocol.go rename to internal/contract/config/effort_protocol.go diff --git a/internal/config/effort_test.go b/internal/contract/config/effort_test.go similarity index 100% rename from internal/config/effort_test.go rename to internal/contract/config/effort_test.go diff --git a/internal/config/effort_vendor_host_test.go b/internal/contract/config/effort_vendor_host_test.go similarity index 100% rename from internal/config/effort_vendor_host_test.go rename to internal/contract/config/effort_vendor_host_test.go diff --git a/internal/config/environment_config.go b/internal/contract/config/environment_config.go similarity index 100% rename from internal/config/environment_config.go rename to internal/contract/config/environment_config.go diff --git a/internal/config/environment_render_test.go b/internal/contract/config/environment_render_test.go similarity index 100% rename from internal/config/environment_render_test.go rename to internal/contract/config/environment_render_test.go diff --git a/internal/config/expand.go b/internal/contract/config/expand.go similarity index 100% rename from internal/config/expand.go rename to internal/contract/config/expand.go diff --git a/internal/config/expand_test.go b/internal/contract/config/expand_test.go similarity index 99% rename from internal/config/expand_test.go rename to internal/contract/config/expand_test.go index 42b5d5a571..8269c87696 100644 --- a/internal/config/expand_test.go +++ b/internal/contract/config/expand_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestExpandVars(t *testing.T) { diff --git a/internal/config/fetch.go b/internal/contract/config/fetch.go similarity index 99% rename from internal/config/fetch.go rename to internal/contract/config/fetch.go index a71c753401..0b81b54445 100644 --- a/internal/config/fetch.go +++ b/internal/contract/config/fetch.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "reasonix/internal/provider/openai" + "reasonix/internal/model/openai" ) var knownModelFetchCompatSuffixes = []string{ diff --git a/internal/config/fetch_test.go b/internal/contract/config/fetch_test.go similarity index 100% rename from internal/config/fetch_test.go rename to internal/contract/config/fetch_test.go diff --git a/internal/config/kimi_k3_test.go b/internal/contract/config/kimi_k3_test.go similarity index 99% rename from internal/config/kimi_k3_test.go rename to internal/contract/config/kimi_k3_test.go index 503d4d03ea..2a7432c1c1 100644 --- a/internal/config/kimi_k3_test.go +++ b/internal/contract/config/kimi_k3_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestKimiK3ReasoningProtocolControlsEffortCapability(t *testing.T) { diff --git a/internal/config/legacy_providers.go b/internal/contract/config/legacy_providers.go similarity index 100% rename from internal/config/legacy_providers.go rename to internal/contract/config/legacy_providers.go diff --git a/internal/config/lkg.go b/internal/contract/config/lkg.go similarity index 100% rename from internal/config/lkg.go rename to internal/contract/config/lkg.go diff --git a/internal/config/lkg_provenance_test.go b/internal/contract/config/lkg_provenance_test.go similarity index 98% rename from internal/config/lkg_provenance_test.go rename to internal/contract/config/lkg_provenance_test.go index 58a6c3a9cd..e45345302e 100644 --- a/internal/config/lkg_provenance_test.go +++ b/internal/contract/config/lkg_provenance_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeLKGSnapshot(t *testing.T, body string) string { diff --git a/internal/config/lkg_test.go b/internal/contract/config/lkg_test.go similarity index 99% rename from internal/config/lkg_test.go rename to internal/contract/config/lkg_test.go index fd964d72d4..9ea7b354af 100644 --- a/internal/config/lkg_test.go +++ b/internal/contract/config/lkg_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestLoadForRootUsesLastKnownGoodWhenUserConfigBroken(t *testing.T) { diff --git a/internal/config/load.go b/internal/contract/config/load.go similarity index 99% rename from internal/config/load.go rename to internal/contract/config/load.go index e3a42770fd..bdf1752517 100644 --- a/internal/config/load.go +++ b/internal/contract/config/load.go @@ -13,9 +13,9 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/billing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/provider" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // Load builds the configuration: defaults, then user config, then project diff --git a/internal/config/load_project_default_test.go b/internal/contract/config/load_project_default_test.go similarity index 99% rename from internal/config/load_project_default_test.go rename to internal/contract/config/load_project_default_test.go index b46e2391ad..047eb43864 100644 --- a/internal/config/load_project_default_test.go +++ b/internal/contract/config/load_project_default_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeProjectDefaultTestConfig(t *testing.T, dir, name, body string) string { diff --git a/internal/config/loadedit_test.go b/internal/contract/config/loadedit_test.go similarity index 98% rename from internal/config/loadedit_test.go rename to internal/contract/config/loadedit_test.go index 050bcf540a..50f982358f 100644 --- a/internal/config/loadedit_test.go +++ b/internal/contract/config/loadedit_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func TestLoadForEdit(t *testing.T) { diff --git a/internal/config/lsp.go b/internal/contract/config/lsp.go similarity index 100% rename from internal/config/lsp.go rename to internal/contract/config/lsp.go diff --git a/internal/config/main_test.go b/internal/contract/config/main_test.go similarity index 97% rename from internal/config/main_test.go rename to internal/contract/config/main_test.go index f6637c8391..c498259455 100644 --- a/internal/config/main_test.go +++ b/internal/contract/config/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestMain(m *testing.M) { diff --git a/internal/config/mcp_command.go b/internal/contract/config/mcp_command.go similarity index 98% rename from internal/config/mcp_command.go rename to internal/contract/config/mcp_command.go index 5938835961..09726d414b 100644 --- a/internal/config/mcp_command.go +++ b/internal/contract/config/mcp_command.go @@ -5,7 +5,7 @@ import ( "strings" "unicode" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // NormalizePluginCommandLine repairs the common MCP copy/paste mistake where a diff --git a/internal/config/mcp_concurrency_round_trip_test.go b/internal/contract/config/mcp_concurrency_round_trip_test.go similarity index 100% rename from internal/config/mcp_concurrency_round_trip_test.go rename to internal/contract/config/mcp_concurrency_round_trip_test.go diff --git a/internal/config/mcpjson.go b/internal/contract/config/mcpjson.go similarity index 99% rename from internal/config/mcpjson.go rename to internal/contract/config/mcpjson.go index b5730d0b5e..2e91eda0b7 100644 --- a/internal/config/mcpjson.go +++ b/internal/contract/config/mcpjson.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // mcpJSONFile is the project-root file Claude Code calls .mcp.json. Reasonix reads diff --git a/internal/config/mcpjson_test.go b/internal/contract/config/mcpjson_test.go similarity index 99% rename from internal/config/mcpjson_test.go rename to internal/contract/config/mcpjson_test.go index 107cc5ecc0..16ddb2ba93 100644 --- a/internal/config/mcpjson_test.go +++ b/internal/contract/config/mcpjson_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func TestLoadMCPJSON(t *testing.T) { diff --git a/internal/config/migrate.go b/internal/contract/config/migrate.go similarity index 99% rename from internal/config/migrate.go rename to internal/contract/config/migrate.go index 5e19c5a6b2..f044f1cb55 100644 --- a/internal/config/migrate.go +++ b/internal/contract/config/migrate.go @@ -13,7 +13,7 @@ import ( "slices" "strings" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // legacyConfig is the subset of the v0.x (~/.reasonix/config.json) schema this diff --git a/internal/config/migrate_hooks_test.go b/internal/contract/config/migrate_hooks_test.go similarity index 97% rename from internal/config/migrate_hooks_test.go rename to internal/contract/config/migrate_hooks_test.go index e8cd142c98..20e9f9a7a4 100644 --- a/internal/config/migrate_hooks_test.go +++ b/internal/contract/config/migrate_hooks_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestMigrateSupportDataCarriesGlobalHooks(t *testing.T) { diff --git a/internal/config/migrate_test.go b/internal/contract/config/migrate_test.go similarity index 99% rename from internal/config/migrate_test.go rename to internal/contract/config/migrate_test.go index 97612b868a..a5a633e684 100644 --- a/internal/config/migrate_test.go +++ b/internal/contract/config/migrate_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // legacyHome points HOME / config-dir / .env resolution at a fresh temp tree and diff --git a/internal/config/model_fallback_test.go b/internal/contract/config/model_fallback_test.go similarity index 100% rename from internal/config/model_fallback_test.go rename to internal/contract/config/model_fallback_test.go diff --git a/internal/config/model_window.go b/internal/contract/config/model_window.go similarity index 100% rename from internal/config/model_window.go rename to internal/contract/config/model_window.go diff --git a/internal/config/model_window_test.go b/internal/contract/config/model_window_test.go similarity index 100% rename from internal/config/model_window_test.go rename to internal/contract/config/model_window_test.go diff --git a/internal/config/mutate.go b/internal/contract/config/mutate.go similarity index 99% rename from internal/config/mutate.go rename to internal/contract/config/mutate.go index 6ab109e20d..968b2ddd1e 100644 --- a/internal/config/mutate.go +++ b/internal/contract/config/mutate.go @@ -14,7 +14,7 @@ import ( "sync/atomic" "time" - "reasonix/internal/filelock" + "reasonix/internal/base/filelock" ) // userEditMu serializes in-process read-modify-write cycles. The public lock diff --git a/internal/config/mutate_test.go b/internal/contract/config/mutate_test.go similarity index 99% rename from internal/config/mutate_test.go rename to internal/contract/config/mutate_test.go index bc35b58069..41c34bdf9f 100644 --- a/internal/config/mutate_test.go +++ b/internal/contract/config/mutate_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestLockUserConfigEditsSerializesRMW drives concurrent load-modify-save diff --git a/internal/config/official_pricing_test.go b/internal/contract/config/official_pricing_test.go similarity index 98% rename from internal/config/official_pricing_test.go rename to internal/contract/config/official_pricing_test.go index 63d44d67e5..b02fe1493b 100644 --- a/internal/config/official_pricing_test.go +++ b/internal/contract/config/official_pricing_test.go @@ -4,8 +4,8 @@ import ( "slices" "testing" - "reasonix/internal/billing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // Every rate this project has shipped as a default must still be recognised, diff --git a/internal/config/passthrough.go b/internal/contract/config/passthrough.go similarity index 100% rename from internal/config/passthrough.go rename to internal/contract/config/passthrough.go diff --git a/internal/config/passthrough_test.go b/internal/contract/config/passthrough_test.go similarity index 98% rename from internal/config/passthrough_test.go rename to internal/contract/config/passthrough_test.go index 7156d69a53..9cd12e3c47 100644 --- a/internal/config/passthrough_test.go +++ b/internal/contract/config/passthrough_test.go @@ -9,7 +9,7 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) const botTableFixture = `default_model = "deepseek-flash" diff --git a/internal/config/path_access.go b/internal/contract/config/path_access.go similarity index 100% rename from internal/config/path_access.go rename to internal/contract/config/path_access.go diff --git a/internal/config/path_isolation_test.go b/internal/contract/config/path_isolation_test.go similarity index 97% rename from internal/config/path_isolation_test.go rename to internal/contract/config/path_isolation_test.go index 05f56be9cf..5e12066111 100644 --- a/internal/config/path_isolation_test.go +++ b/internal/contract/config/path_isolation_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func requireTestPathWithin(t *testing.T, root, path string) { diff --git a/internal/config/paths.go b/internal/contract/config/paths.go similarity index 99% rename from internal/config/paths.go rename to internal/contract/config/paths.go index c8df18b0d5..197262a828 100644 --- a/internal/config/paths.go +++ b/internal/contract/config/paths.go @@ -10,7 +10,7 @@ import ( "strings" "unicode/utf8" - "reasonix/internal/command" + "reasonix/internal/ext/command" ) var ( @@ -498,10 +498,10 @@ func (r Roots) MemoryUserDir() string { return r.userSupportDir() } // ConventionDirs are the parent directories scanned for agent assets (skills, // commands), in canonical-first order. .reasonix is ours; .agents / .agent / // .claude let users drop in assets authored for other agent tools without moving -// files. Shared so skills (internal/skill) and commands (CommandDirs) discover +// files. Shared so skills (internal/ext/skill) and commands (CommandDirs) discover // the same set. Note: hooks are NOT scanned across these — a .claude/settings.json // uses a different hook schema that can't be parsed as ours, so hooks stay in -// .reasonix/settings.json (see internal/hook). +// .reasonix/settings.json (see internal/ext/hook). var ConventionDirs = []string{".reasonix", ".agents", ".agent", ".claude"} // conventionSubdirsAsc joins sub under each ConventionDir of base, in ascending diff --git a/internal/config/plugin_entry.go b/internal/contract/config/plugin_entry.go similarity index 100% rename from internal/config/plugin_entry.go rename to internal/contract/config/plugin_entry.go diff --git a/internal/config/plugin_packages.go b/internal/contract/config/plugin_packages.go similarity index 99% rename from internal/config/plugin_packages.go rename to internal/contract/config/plugin_packages.go index 8ba0f39b2f..2e374c4bfc 100644 --- a/internal/config/plugin_packages.go +++ b/internal/contract/config/plugin_packages.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "reasonix/internal/command" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/command" + "reasonix/internal/ext/pluginpkg" ) // mergeInstalledPluginPackages overlays enabled plugin package capabilities onto diff --git a/internal/config/plugin_packages_test.go b/internal/contract/config/plugin_packages_test.go similarity index 98% rename from internal/config/plugin_packages_test.go rename to internal/contract/config/plugin_packages_test.go index 45786c9f89..76b61fc93b 100644 --- a/internal/config/plugin_packages_test.go +++ b/internal/contract/config/plugin_packages_test.go @@ -3,11 +3,11 @@ package config import ( "os" "path/filepath" - "reasonix/internal/command" + "reasonix/internal/ext/command" "testing" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) func TestLoadMergesInstalledPluginSkillRootsAndMCP(t *testing.T) { diff --git a/internal/config/policies.go b/internal/contract/config/policies.go similarity index 100% rename from internal/config/policies.go rename to internal/contract/config/policies.go diff --git a/internal/config/preset_upgrade.go b/internal/contract/config/preset_upgrade.go similarity index 100% rename from internal/config/preset_upgrade.go rename to internal/contract/config/preset_upgrade.go diff --git a/internal/config/pricing.go b/internal/contract/config/pricing.go similarity index 99% rename from internal/config/pricing.go rename to internal/contract/config/pricing.go index 8d3ba8a5b9..bc5d3e60a9 100644 --- a/internal/config/pricing.go +++ b/internal/contract/config/pricing.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/billing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // DeepSeek's rates live in billing's history, which publishes the current diff --git a/internal/config/probe.go b/internal/contract/config/probe.go similarity index 100% rename from internal/config/probe.go rename to internal/contract/config/probe.go diff --git a/internal/config/probe_failure.go b/internal/contract/config/probe_failure.go similarity index 98% rename from internal/config/probe_failure.go rename to internal/contract/config/probe_failure.go index 2248ea0f17..9b55fd7258 100644 --- a/internal/config/probe_failure.go +++ b/internal/contract/config/probe_failure.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "reasonix/internal/provider/openai" + "reasonix/internal/model/openai" ) // ProbeReason names why probing failed. Each one sends the user to a different diff --git a/internal/config/probe_key.go b/internal/contract/config/probe_key.go similarity index 100% rename from internal/config/probe_key.go rename to internal/contract/config/probe_key.go diff --git a/internal/config/probe_test.go b/internal/contract/config/probe_test.go similarity index 100% rename from internal/config/probe_test.go rename to internal/contract/config/probe_test.go diff --git a/internal/config/protocol.go b/internal/contract/config/protocol.go similarity index 100% rename from internal/config/protocol.go rename to internal/contract/config/protocol.go diff --git a/internal/config/protocol_declared.go b/internal/contract/config/protocol_declared.go similarity index 98% rename from internal/config/protocol_declared.go rename to internal/contract/config/protocol_declared.go index 45bac36668..aec146a299 100644 --- a/internal/config/protocol_declared.go +++ b/internal/contract/config/protocol_declared.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "reasonix/internal/provider/openai" + "reasonix/internal/model/openai" ) // ProtocolsDeclaredBy reads the wires a model listing names for itself. A relay diff --git a/internal/config/protocol_declared_test.go b/internal/contract/config/protocol_declared_test.go similarity index 98% rename from internal/config/protocol_declared_test.go rename to internal/contract/config/protocol_declared_test.go index dc4ce3da42..ccd212877e 100644 --- a/internal/config/protocol_declared_test.go +++ b/internal/contract/config/protocol_declared_test.go @@ -4,7 +4,7 @@ import ( "slices" "testing" - "reasonix/internal/provider/openai" + "reasonix/internal/model/openai" ) // A relay serving Claude behind an OpenAI-shaped listing is invisible to diff --git a/internal/config/protocol_test.go b/internal/contract/config/protocol_test.go similarity index 95% rename from internal/config/protocol_test.go rename to internal/contract/config/protocol_test.go index 23a24c13ae..e31227471d 100644 --- a/internal/config/protocol_test.go +++ b/internal/contract/config/protocol_test.go @@ -4,17 +4,17 @@ import ( "slices" "testing" - "reasonix/internal/provider" - _ "reasonix/internal/provider/anthropic" - _ "reasonix/internal/provider/openai" - _ "reasonix/internal/provider/responses" + "reasonix/internal/contract/provider" + _ "reasonix/internal/model/anthropic" + _ "reasonix/internal/model/openai" + _ "reasonix/internal/model/responses" ) // The catalog is what every frontend offers and the registry is what the kernel // can build a conversation on. A chat kind in one and not the other is a wire // nobody can pick or a menu entry that fails on the first turn. A decision wire // holds no conversation, so a factory for it would be a chat client that cannot -// chat: it is built by the decision path instead, which internal/boot holds. +// chat: it is built by the decision path instead, which internal/assembly/boot holds. func TestCatalogAndRegistryDescribeTheSameWires(t *testing.T) { registered := provider.Kinds() for _, p := range Protocols() { diff --git a/internal/config/provider_isolation_test.go b/internal/contract/config/provider_isolation_test.go similarity index 99% rename from internal/config/provider_isolation_test.go rename to internal/contract/config/provider_isolation_test.go index 52a231b817..27302add53 100644 --- a/internal/config/provider_isolation_test.go +++ b/internal/contract/config/provider_isolation_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // customProviderTOML declares a single self-hosted OpenAI-compatible provider diff --git a/internal/config/provider_model_rename.go b/internal/contract/config/provider_model_rename.go similarity index 100% rename from internal/config/provider_model_rename.go rename to internal/contract/config/provider_model_rename.go diff --git a/internal/config/provider_presets.go b/internal/contract/config/provider_presets.go similarity index 99% rename from internal/config/provider_presets.go rename to internal/contract/config/provider_presets.go index 288c358590..010523a6c9 100644 --- a/internal/config/provider_presets.go +++ b/internal/contract/config/provider_presets.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // ProviderPreset is a curated, editable provider starter template. Presets are diff --git a/internal/config/provider_presets_opencode_go.go b/internal/contract/config/provider_presets_opencode_go.go similarity index 100% rename from internal/config/provider_presets_opencode_go.go rename to internal/contract/config/provider_presets_opencode_go.go diff --git a/internal/config/provider_presets_test.go b/internal/contract/config/provider_presets_test.go similarity index 100% rename from internal/config/provider_presets_test.go rename to internal/contract/config/provider_presets_test.go diff --git a/internal/config/proxy_test.go b/internal/contract/config/proxy_test.go similarity index 100% rename from internal/config/proxy_test.go rename to internal/contract/config/proxy_test.go diff --git a/internal/config/reasoning_display.go b/internal/contract/config/reasoning_display.go similarity index 100% rename from internal/config/reasoning_display.go rename to internal/contract/config/reasoning_display.go diff --git a/internal/config/reasoning_display_test.go b/internal/contract/config/reasoning_display_test.go similarity index 100% rename from internal/config/reasoning_display_test.go rename to internal/contract/config/reasoning_display_test.go diff --git a/internal/config/remote.go b/internal/contract/config/remote.go similarity index 100% rename from internal/config/remote.go rename to internal/contract/config/remote.go diff --git a/internal/config/remote_config_test.go b/internal/contract/config/remote_config_test.go similarity index 99% rename from internal/config/remote_config_test.go rename to internal/contract/config/remote_config_test.go index a46d46caeb..5faa6a33e7 100644 --- a/internal/config/remote_config_test.go +++ b/internal/contract/config/remote_config_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestProjectConfigCannotOverrideRemote pins [remote] as a user-global diff --git a/internal/config/remote_credentials.go b/internal/contract/config/remote_credentials.go similarity index 100% rename from internal/config/remote_credentials.go rename to internal/contract/config/remote_credentials.go diff --git a/internal/config/render.go b/internal/contract/config/render.go similarity index 99% rename from internal/config/render.go rename to internal/contract/config/render.go index 4feedc1600..887605513e 100644 --- a/internal/config/render.go +++ b/internal/contract/config/render.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "reasonix/internal/billing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) type RenderScope string diff --git a/internal/config/render_delegation.go b/internal/contract/config/render_delegation.go similarity index 100% rename from internal/config/render_delegation.go rename to internal/contract/config/render_delegation.go diff --git a/internal/config/render_desktop.go b/internal/contract/config/render_desktop.go similarity index 100% rename from internal/config/render_desktop.go rename to internal/contract/config/render_desktop.go diff --git a/internal/config/render_memory.go b/internal/contract/config/render_memory.go similarity index 100% rename from internal/config/render_memory.go rename to internal/contract/config/render_memory.go diff --git a/internal/config/render_plugin.go b/internal/contract/config/render_plugin.go similarity index 100% rename from internal/config/render_plugin.go rename to internal/contract/config/render_plugin.go diff --git a/internal/config/render_remote.go b/internal/contract/config/render_remote.go similarity index 100% rename from internal/config/render_remote.go rename to internal/contract/config/render_remote.go diff --git a/internal/config/render_test.go b/internal/contract/config/render_test.go similarity index 99% rename from internal/config/render_test.go rename to internal/contract/config/render_test.go index 4ca9c2e30c..fd2eb3388d 100644 --- a/internal/config/render_test.go +++ b/internal/contract/config/render_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/BurntSushi/toml" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func isolateUserConfigHome(t *testing.T) string { diff --git a/internal/config/responses_continuation.go b/internal/contract/config/responses_continuation.go similarity index 100% rename from internal/config/responses_continuation.go rename to internal/contract/config/responses_continuation.go diff --git a/internal/config/retired_keys.go b/internal/contract/config/retired_keys.go similarity index 98% rename from internal/config/retired_keys.go rename to internal/contract/config/retired_keys.go index bd4643e686..de73c23cbb 100644 --- a/internal/config/retired_keys.go +++ b/internal/contract/config/retired_keys.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // MigrateLegacyAgentStepLimitsForRoot removes retired [agent] step-limit keys diff --git a/internal/config/roles.go b/internal/contract/config/roles.go similarity index 100% rename from internal/config/roles.go rename to internal/contract/config/roles.go diff --git a/internal/config/safe_mode_test.go b/internal/contract/config/safe_mode_test.go similarity index 96% rename from internal/config/safe_mode_test.go rename to internal/contract/config/safe_mode_test.go index 0edbf7a8d3..7ccd2ad8c1 100644 --- a/internal/config/safe_mode_test.go +++ b/internal/contract/config/safe_mode_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestBuiltinDefaultsDoNotReadOrRewriteMalformedConfig(t *testing.T) { diff --git a/internal/config/sandbox_test.go b/internal/contract/config/sandbox_test.go similarity index 100% rename from internal/config/sandbox_test.go rename to internal/contract/config/sandbox_test.go diff --git a/internal/config/skill_name.go b/internal/contract/config/skill_name.go similarity index 100% rename from internal/config/skill_name.go rename to internal/contract/config/skill_name.go diff --git a/internal/config/state_root_entries_test.go b/internal/contract/config/state_root_entries_test.go similarity index 98% rename from internal/config/state_root_entries_test.go rename to internal/contract/config/state_root_entries_test.go index d84ee334dc..7347aeee54 100644 --- a/internal/config/state_root_entries_test.go +++ b/internal/contract/config/state_root_entries_test.go @@ -18,7 +18,7 @@ import ( // were all in that position. This reads the tree rather than trusting a list // someone has to remember to extend. func TestStateRootEntriesCoversEverythingWrittenThere(t *testing.T) { - root := filepath.Join("..", "..") + root := filepath.Join("..", "..", "..") found := map[string]string{} err := filepath.WalkDir(filepath.Join(root, "internal"), func(path string, d os.DirEntry, err error) error { if err != nil || d.IsDir() || !strings.HasSuffix(path, ".go") || strings.HasSuffix(path, "_test.go") { diff --git a/internal/config/storage_config.go b/internal/contract/config/storage_config.go similarity index 98% rename from internal/config/storage_config.go rename to internal/contract/config/storage_config.go index f582bd911e..8f9392a1f6 100644 --- a/internal/config/storage_config.go +++ b/internal/contract/config/storage_config.go @@ -9,7 +9,7 @@ import ( "github.com/BurntSushi/toml" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // storageSection is the [storage] table: root id to directory. A map rather diff --git a/internal/config/storage_roots.go b/internal/contract/config/storage_roots.go similarity index 100% rename from internal/config/storage_roots.go rename to internal/contract/config/storage_roots.go diff --git a/internal/config/storage_roots_test.go b/internal/contract/config/storage_roots_test.go similarity index 99% rename from internal/config/storage_roots_test.go rename to internal/contract/config/storage_roots_test.go index 3cc66716d0..d2599502c4 100644 --- a/internal/config/storage_roots_test.go +++ b/internal/contract/config/storage_roots_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeStorageSection(t *testing.T, home, body string) { diff --git a/internal/config/subagent_model_test.go b/internal/contract/config/subagent_model_test.go similarity index 100% rename from internal/config/subagent_model_test.go rename to internal/contract/config/subagent_model_test.go diff --git a/internal/config/system_prompt_test.go b/internal/contract/config/system_prompt_test.go similarity index 99% rename from internal/config/system_prompt_test.go rename to internal/contract/config/system_prompt_test.go index 4c96c756c0..f252094e96 100644 --- a/internal/config/system_prompt_test.go +++ b/internal/contract/config/system_prompt_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func TestDefaultSystemPromptStaysLean(t *testing.T) { diff --git a/internal/config/systemone.go b/internal/contract/config/systemone.go similarity index 100% rename from internal/config/systemone.go rename to internal/contract/config/systemone.go diff --git a/internal/config/systemone_migrate.go b/internal/contract/config/systemone_migrate.go similarity index 98% rename from internal/config/systemone_migrate.go rename to internal/contract/config/systemone_migrate.go index 6735a0781c..edfc52496e 100644 --- a/internal/config/systemone_migrate.go +++ b/internal/contract/config/systemone_migrate.go @@ -4,7 +4,7 @@ package config import ( "strings" - "reasonix/internal/typesafe" + "reasonix/internal/safety/typesafe" ) // migrateSystemOneToDecisionRole turns the decision settings into what every diff --git a/internal/config/systemone_migrate_test.go b/internal/contract/config/systemone_migrate_test.go similarity index 100% rename from internal/config/systemone_migrate_test.go rename to internal/contract/config/systemone_migrate_test.go diff --git a/internal/config/systemone_test.go b/internal/contract/config/systemone_test.go similarity index 100% rename from internal/config/systemone_test.go rename to internal/contract/config/systemone_test.go diff --git a/internal/config/systemprompt.go b/internal/contract/config/systemprompt.go similarity index 98% rename from internal/config/systemprompt.go rename to internal/contract/config/systemprompt.go index d7fdd4213a..6f6c225557 100644 --- a/internal/config/systemprompt.go +++ b/internal/contract/config/systemprompt.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // ResolveSystemPrompt returns the system prompt, reading system_prompt_file if set. diff --git a/internal/config/telemetry_test.go b/internal/contract/config/telemetry_test.go similarity index 98% rename from internal/config/telemetry_test.go rename to internal/contract/config/telemetry_test.go index 866143ec5d..1353f90ebf 100644 --- a/internal/config/telemetry_test.go +++ b/internal/contract/config/telemetry_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestCLITelemetryConfigDefaultsAndValidation(t *testing.T) { diff --git a/internal/config/thinking_params.go b/internal/contract/config/thinking_params.go similarity index 100% rename from internal/config/thinking_params.go rename to internal/contract/config/thinking_params.go diff --git a/internal/config/toml_assignment.go b/internal/contract/config/toml_assignment.go similarity index 100% rename from internal/config/toml_assignment.go rename to internal/contract/config/toml_assignment.go diff --git a/internal/config/tools_test.go b/internal/contract/config/tools_test.go similarity index 100% rename from internal/config/tools_test.go rename to internal/contract/config/tools_test.go diff --git a/internal/config/unparsed.go b/internal/contract/config/unparsed.go similarity index 99% rename from internal/config/unparsed.go rename to internal/contract/config/unparsed.go index 338aacc6d5..b1c9a021d2 100644 --- a/internal/config/unparsed.go +++ b/internal/contract/config/unparsed.go @@ -12,7 +12,7 @@ import ( "github.com/BurntSushi/toml" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // What a surface is showing while the file on disk cannot be read. diff --git a/internal/config/unparsed_test.go b/internal/contract/config/unparsed_test.go similarity index 99% rename from internal/config/unparsed_test.go rename to internal/contract/config/unparsed_test.go index 3a104cb130..c9f8e247b6 100644 --- a/internal/config/unparsed_test.go +++ b/internal/contract/config/unparsed_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // The line a Windows user writes by hand. TOML reads \U as the start of a code diff --git a/internal/config/vision.go b/internal/contract/config/vision.go similarity index 99% rename from internal/config/vision.go rename to internal/contract/config/vision.go index 6747a1f7c7..1fd21d37f0 100644 --- a/internal/config/vision.go +++ b/internal/contract/config/vision.go @@ -5,7 +5,7 @@ import ( "slices" "strings" - "reasonix/internal/provider/openai" + "reasonix/internal/model/openai" ) var mimoVisionModels = map[string]bool{ diff --git a/internal/config/vision_offer.go b/internal/contract/config/vision_offer.go similarity index 100% rename from internal/config/vision_offer.go rename to internal/contract/config/vision_offer.go diff --git a/internal/config/vision_test.go b/internal/contract/config/vision_test.go similarity index 100% rename from internal/config/vision_test.go rename to internal/contract/config/vision_test.go diff --git a/internal/config/web_search.go b/internal/contract/config/web_search.go similarity index 100% rename from internal/config/web_search.go rename to internal/contract/config/web_search.go diff --git a/internal/config/web_search_test.go b/internal/contract/config/web_search_test.go similarity index 99% rename from internal/config/web_search_test.go rename to internal/contract/config/web_search_test.go index 6afc05bc5d..2889232f4b 100644 --- a/internal/config/web_search_test.go +++ b/internal/contract/config/web_search_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/BurntSushi/toml" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestEffectiveWebSearchDefaultsOnlySupportedOfficialDeepSeekAPIs(t *testing.T) { diff --git a/internal/config/workspace_slug_test.go b/internal/contract/config/workspace_slug_test.go similarity index 100% rename from internal/config/workspace_slug_test.go rename to internal/contract/config/workspace_slug_test.go diff --git a/internal/event/audit_forwarder.go b/internal/contract/event/audit_forwarder.go similarity index 96% rename from internal/event/audit_forwarder.go rename to internal/contract/event/audit_forwarder.go index 177ac4088a..b1476ad30a 100644 --- a/internal/event/audit_forwarder.go +++ b/internal/contract/event/audit_forwarder.go @@ -1,8 +1,8 @@ package event import ( - "reasonix/internal/evidence" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" + "reasonix/internal/runtime/evidence" ) // AuditForwarder forwards every optional sink capability to Inner. Embed it in diff --git a/internal/event/bound.go b/internal/contract/event/bound.go similarity index 100% rename from internal/event/bound.go rename to internal/contract/event/bound.go diff --git a/internal/event/cache_diagnostics.go b/internal/contract/event/cache_diagnostics.go similarity index 100% rename from internal/event/cache_diagnostics.go rename to internal/contract/event/cache_diagnostics.go diff --git a/internal/event/coalesce.go b/internal/contract/event/coalesce.go similarity index 98% rename from internal/event/coalesce.go rename to internal/contract/event/coalesce.go index 5fd35f5eb8..88967f303f 100644 --- a/internal/event/coalesce.go +++ b/internal/contract/event/coalesce.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "reasonix/internal/evidence" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" + "reasonix/internal/runtime/evidence" ) // coalesceMaxBytes bounds a merged delta so one event never carries an diff --git a/internal/event/coalesce_test.go b/internal/contract/event/coalesce_test.go similarity index 99% rename from internal/event/coalesce_test.go rename to internal/contract/event/coalesce_test.go index d0dd054725..8e78671e54 100644 --- a/internal/event/coalesce_test.go +++ b/internal/contract/event/coalesce_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) type coalesceRecordSink struct { diff --git a/internal/event/completion.go b/internal/contract/event/completion.go similarity index 100% rename from internal/event/completion.go rename to internal/contract/event/completion.go diff --git a/internal/event/costquote_sink.go b/internal/contract/event/costquote_sink.go similarity index 98% rename from internal/event/costquote_sink.go rename to internal/contract/event/costquote_sink.go index 208e7b198f..5e64d3fa77 100644 --- a/internal/event/costquote_sink.go +++ b/internal/contract/event/costquote_sink.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "reasonix/internal/billing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // QuoteContext supplies an explicit display request for the CostQuote diff --git a/internal/event/costquote_sink_test.go b/internal/contract/event/costquote_sink_test.go similarity index 94% rename from internal/event/costquote_sink_test.go rename to internal/contract/event/costquote_sink_test.go index 62f6ce5694..e25041ff41 100644 --- a/internal/event/costquote_sink_test.go +++ b/internal/contract/event/costquote_sink_test.go @@ -3,7 +3,7 @@ package event import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestEnsureCostQuoteDoesNotUseRuntimeFX(t *testing.T) { diff --git a/internal/event/event.go b/internal/contract/event/event.go similarity index 99% rename from internal/event/event.go rename to internal/contract/event/event.go index 2ae6ceb5e2..58f72d7542 100644 --- a/internal/event/event.go +++ b/internal/contract/event/event.go @@ -14,10 +14,10 @@ package event import ( "encoding/json" - "reasonix/internal/agentgraph" - "reasonix/internal/billing" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" + "reasonix/internal/runtime/evidence" ) // Kind tags an Event. Read the field(s) documented for that kind. diff --git a/internal/event/event_test.go b/internal/contract/event/event_test.go similarity index 99% rename from internal/event/event_test.go rename to internal/contract/event/event_test.go index 8b158a02e4..e095aed33d 100644 --- a/internal/event/event_test.go +++ b/internal/contract/event/event_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) // Kind constants diff --git a/internal/event/extension.go b/internal/contract/event/extension.go similarity index 100% rename from internal/event/extension.go rename to internal/contract/event/extension.go diff --git a/internal/event/notice_codes.go b/internal/contract/event/notice_codes.go similarity index 100% rename from internal/event/notice_codes.go rename to internal/contract/event/notice_codes.go diff --git a/internal/event/project_check_probe.go b/internal/contract/event/project_check_probe.go similarity index 98% rename from internal/event/project_check_probe.go rename to internal/contract/event/project_check_probe.go index 7956192952..77e391773b 100644 --- a/internal/event/project_check_probe.go +++ b/internal/contract/event/project_check_probe.go @@ -1,7 +1,7 @@ // project_check_probe.go — the two project-check derivations, compared. package event -import "reasonix/internal/nilutil" +import "reasonix/internal/base/nilutil" // Divergence classes. Each names the one explanation that accounts for a // disagreement, in the order they are tried: an earlier class rules out the diff --git a/internal/event/receipt.go b/internal/contract/event/receipt.go similarity index 100% rename from internal/event/receipt.go rename to internal/contract/event/receipt.go diff --git a/internal/event/receipt_test.go b/internal/contract/event/receipt_test.go similarity index 100% rename from internal/event/receipt_test.go rename to internal/contract/event/receipt_test.go diff --git a/internal/event/record.go b/internal/contract/event/record.go similarity index 99% rename from internal/event/record.go rename to internal/contract/event/record.go index b4cfce07cb..9e7f679ca2 100644 --- a/internal/event/record.go +++ b/internal/contract/event/record.go @@ -1,8 +1,8 @@ package event import ( - "reasonix/internal/evidence" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" + "reasonix/internal/runtime/evidence" ) // Forwarding a turn's audit signals to sinks that opt into them. Each is a diff --git a/internal/event/run_budget.go b/internal/contract/event/run_budget.go similarity index 97% rename from internal/event/run_budget.go rename to internal/contract/event/run_budget.go index 002fe0c22b..015f7504a6 100644 --- a/internal/event/run_budget.go +++ b/internal/contract/event/run_budget.go @@ -1,6 +1,6 @@ package event -import "reasonix/internal/nilutil" +import "reasonix/internal/base/nilutil" // RunBudgetTotals is one scope's accumulated spend: counts and money, never // content. Priced is false when no price table covered it, so a reader can diff --git a/internal/event/sink_capabilities.go b/internal/contract/event/sink_capabilities.go similarity index 100% rename from internal/event/sink_capabilities.go rename to internal/contract/event/sink_capabilities.go diff --git a/internal/event/sink_capabilities_test.go b/internal/contract/event/sink_capabilities_test.go similarity index 99% rename from internal/event/sink_capabilities_test.go rename to internal/contract/event/sink_capabilities_test.go index 0f82b8730e..baa431f282 100644 --- a/internal/event/sink_capabilities_test.go +++ b/internal/contract/event/sink_capabilities_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // capturingSink implements every optional capability so a chain test can prove diff --git a/internal/event/subagent_handoff.go b/internal/contract/event/subagent_handoff.go similarity index 98% rename from internal/event/subagent_handoff.go rename to internal/contract/event/subagent_handoff.go index 9aab29dde7..f8f09690d6 100644 --- a/internal/event/subagent_handoff.go +++ b/internal/contract/event/subagent_handoff.go @@ -1,7 +1,7 @@ // subagent_handoff.go — how a delegated child closed, counted. package event -import "reasonix/internal/nilutil" +import "reasonix/internal/base/nilutil" // SubagentHandoffAudit is one child run's closing protocol, counted. It exists // to answer whether a typed handoff is submitted naturally, before anything is diff --git a/internal/event/subagent_progress.go b/internal/contract/event/subagent_progress.go similarity index 100% rename from internal/event/subagent_progress.go rename to internal/contract/event/subagent_progress.go diff --git a/internal/event/sync.go b/internal/contract/event/sync.go similarity index 94% rename from internal/event/sync.go rename to internal/contract/event/sync.go index 298b5ac0f4..b8e835552b 100644 --- a/internal/event/sync.go +++ b/internal/contract/event/sync.go @@ -3,13 +3,13 @@ package event import ( "sync" - "reasonix/internal/evidence" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" + "reasonix/internal/runtime/evidence" ) // Sync wraps a Sink so concurrent Emit calls are serialized. The base Sink // contract assumes serial emission — the agent's run loop emits one event at a -// time. Background jobs (internal/jobs) emit from their own goroutines, which can +// time. Background jobs (internal/runtime/jobs) emit from their own goroutines, which can // overlap a running turn's emission; wrapping the session sink once in Sync keeps // the serial-Emit invariant every sink relies on (an SSE writer, a webview // EventsEmit, a TUI channel) without each having to lock. A nil sink yields diff --git a/internal/event/tool_cost.go b/internal/contract/event/tool_cost.go similarity index 93% rename from internal/event/tool_cost.go rename to internal/contract/event/tool_cost.go index f1881ef248..aaa3cbe280 100644 --- a/internal/event/tool_cost.go +++ b/internal/contract/event/tool_cost.go @@ -1,6 +1,6 @@ package event -import "reasonix/internal/tokencount" +import "reasonix/internal/base/tokencount" // ContextTokens estimates what this call left in the prompt — arguments plus // the result the model reads back, which every later turn pays for again. A diff --git a/internal/event/tool_issuer.go b/internal/contract/event/tool_issuer.go similarity index 100% rename from internal/event/tool_issuer.go rename to internal/contract/event/tool_issuer.go diff --git a/internal/event/verification_drift.go b/internal/contract/event/verification_drift.go similarity index 96% rename from internal/event/verification_drift.go rename to internal/contract/event/verification_drift.go index 42f6fc603a..8dbc2ff961 100644 --- a/internal/event/verification_drift.go +++ b/internal/contract/event/verification_drift.go @@ -2,7 +2,7 @@ // one this process loaded. package event -import "reasonix/internal/nilutil" +import "reasonix/internal/base/nilutil" // VerificationContractDrift is one comparison between the contract a resumed // Goal was frozen under and the declaration the current process read. It diff --git a/internal/event/workspace_lease.go b/internal/contract/event/workspace_lease.go similarity index 100% rename from internal/event/workspace_lease.go rename to internal/contract/event/workspace_lease.go diff --git a/internal/event/workspace_mutation.go b/internal/contract/event/workspace_mutation.go similarity index 96% rename from internal/event/workspace_mutation.go rename to internal/contract/event/workspace_mutation.go index f2e53c3a81..b412146234 100644 --- a/internal/event/workspace_mutation.go +++ b/internal/contract/event/workspace_mutation.go @@ -1,6 +1,6 @@ package event -import "reasonix/internal/nilutil" +import "reasonix/internal/base/nilutil" // WorkspaceMutation is a host-only resource invalidation produced immediately // after one concrete writer finishes. It is separate from ToolResult ordering diff --git a/internal/eventwire/attribution.go b/internal/contract/eventwire/attribution.go similarity index 90% rename from internal/eventwire/attribution.go rename to internal/contract/eventwire/attribution.go index 9546a1c3f6..b111fc5e62 100644 --- a/internal/eventwire/attribution.go +++ b/internal/contract/eventwire/attribution.go @@ -1,6 +1,6 @@ package eventwire -import "reasonix/internal/event" +import "reasonix/internal/contract/event" // wireModelRef is the model a frontend may attribute a frame to: the turn's on // a start, a second model's on the text it wrote. The turn's own chunks carry diff --git a/internal/eventwire/costquote_compat_test.go b/internal/contract/eventwire/costquote_compat_test.go similarity index 96% rename from internal/eventwire/costquote_compat_test.go rename to internal/contract/eventwire/costquote_compat_test.go index b782d64526..a81b7ee585 100644 --- a/internal/eventwire/costquote_compat_test.go +++ b/internal/contract/eventwire/costquote_compat_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // Ensures older clients still see cost/currency aliases while new clients get costQuote. diff --git a/internal/eventwire/extension.go b/internal/contract/eventwire/extension.go similarity index 99% rename from internal/eventwire/extension.go rename to internal/contract/eventwire/extension.go index acad837729..6eb9056c1f 100644 --- a/internal/eventwire/extension.go +++ b/internal/contract/eventwire/extension.go @@ -6,7 +6,7 @@ package eventwire import ( "encoding/json" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // ExtensionSurface is the JSON form of an event.ExtensionSurfacePayload. diff --git a/internal/eventwire/frontend_contract_test.go b/internal/contract/eventwire/frontend_contract_test.go similarity index 95% rename from internal/eventwire/frontend_contract_test.go rename to internal/contract/eventwire/frontend_contract_test.go index 4bd79be3ea..d9beb4532a 100644 --- a/internal/eventwire/frontend_contract_test.go +++ b/internal/contract/eventwire/frontend_contract_test.go @@ -15,7 +15,7 @@ import ( // sent {model, effort}, so every card fell through to a fallback that reported // a delegate's step count as a number of delegates. func TestFrontendTypesReadOnlyFieldsTheWireCarries(t *testing.T) { - tsPath := filepath.Join("..", "..", "desktop", "frontend-next", "src", "port", "wire.ts") + tsPath := filepath.Join("..", "..", "..", "desktop", "frontend-next", "src", "port", "wire.ts") tsSrc, err := os.ReadFile(tsPath) if err != nil { t.Skipf("frontend wire types unavailable: %v", err) diff --git a/internal/eventwire/receipt.go b/internal/contract/eventwire/receipt.go similarity index 98% rename from internal/eventwire/receipt.go rename to internal/contract/eventwire/receipt.go index d6bd163c3d..14d33c1f77 100644 --- a/internal/eventwire/receipt.go +++ b/internal/contract/eventwire/receipt.go @@ -1,6 +1,6 @@ package eventwire -import "reasonix/internal/event" +import "reasonix/internal/contract/event" // CompletionReceipt is the JSON form of event.CompletionReceipt: what the host // verified about a turn's work, and what it could not. diff --git a/internal/eventwire/wire.go b/internal/contract/eventwire/wire.go similarity index 99% rename from internal/eventwire/wire.go rename to internal/contract/eventwire/wire.go index 8b665a7737..fcf004d770 100644 --- a/internal/eventwire/wire.go +++ b/internal/contract/eventwire/wire.go @@ -2,10 +2,10 @@ package eventwire import ( - "reasonix/internal/agentgraph" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // Event is the JSON-friendly form shared by event frontends. diff --git a/internal/eventwire/wire_extension_test.go b/internal/contract/eventwire/wire_extension_test.go similarity index 99% rename from internal/eventwire/wire_extension_test.go rename to internal/contract/eventwire/wire_extension_test.go index a4f4bcdf80..5c9773b551 100644 --- a/internal/eventwire/wire_extension_test.go +++ b/internal/contract/eventwire/wire_extension_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // TestToWireExtensionSurfacePayloads covers the stage-8a extension surface diff --git a/internal/eventwire/wire_test.go b/internal/contract/eventwire/wire_test.go similarity index 98% rename from internal/eventwire/wire_test.go rename to internal/contract/eventwire/wire_test.go index ffbe174b0d..2f5597538a 100644 --- a/internal/eventwire/wire_test.go +++ b/internal/contract/eventwire/wire_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tokencount" + "reasonix/internal/base/tokencount" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) func TestToWireRetryingJSON(t *testing.T) { @@ -318,7 +318,7 @@ func readDesktopTypes(t *testing.T) string { if !ok { t.Fatal("runtime caller unavailable") } - path := filepath.Join(filepath.Dir(file), "..", "..", "desktop", "frontend-next", "src", "port", "wire.ts") + path := filepath.Join(filepath.Dir(file), "..", "..", "..", "desktop", "frontend-next", "src", "port", "wire.ts") b, err := os.ReadFile(path) if err != nil { t.Fatalf("read desktop types: %v", err) @@ -495,7 +495,7 @@ func TestToWireInteractionAndLifecyclePayloads(t *testing.T) { } func TestToWireToolCarriesItsOwnContextCost(t *testing.T) { - args := `{"path":"internal/provider/retry.go"}` + args := `{"path":"internal/contract/provider/retry.go"}` output := " 1→package provider\n 2→\n 3→import \"time\"\n" w := ToWire(event.Event{Kind: event.ToolResult, Tool: event.Tool{ ID: "c1", Name: "read_file", Args: args, Output: output, diff --git a/internal/eventwire/workspace_lease.go b/internal/contract/eventwire/workspace_lease.go similarity index 94% rename from internal/eventwire/workspace_lease.go rename to internal/contract/eventwire/workspace_lease.go index 9889123b11..803f892dc4 100644 --- a/internal/eventwire/workspace_lease.go +++ b/internal/contract/eventwire/workspace_lease.go @@ -1,6 +1,6 @@ package eventwire -import "reasonix/internal/event" +import "reasonix/internal/contract/event" // WorkspaceLease is the JSON form of event.WorkspaceLease. type WorkspaceLease struct { diff --git a/internal/plancontract/diff.go b/internal/contract/plancontract/diff.go similarity index 100% rename from internal/plancontract/diff.go rename to internal/contract/plancontract/diff.go diff --git a/internal/plancontract/diff_test.go b/internal/contract/plancontract/diff_test.go similarity index 100% rename from internal/plancontract/diff_test.go rename to internal/contract/plancontract/diff_test.go diff --git a/internal/plancontract/doc.go b/internal/contract/plancontract/doc.go similarity index 100% rename from internal/plancontract/doc.go rename to internal/contract/plancontract/doc.go diff --git a/internal/plancontract/order.go b/internal/contract/plancontract/order.go similarity index 100% rename from internal/plancontract/order.go rename to internal/contract/plancontract/order.go diff --git a/internal/plancontract/order_test.go b/internal/contract/plancontract/order_test.go similarity index 100% rename from internal/plancontract/order_test.go rename to internal/contract/plancontract/order_test.go diff --git a/internal/plancontract/plan.go b/internal/contract/plancontract/plan.go similarity index 100% rename from internal/plancontract/plan.go rename to internal/contract/plancontract/plan.go diff --git a/internal/plancontract/plan_test.go b/internal/contract/plancontract/plan_test.go similarity index 100% rename from internal/plancontract/plan_test.go rename to internal/contract/plancontract/plan_test.go diff --git a/internal/plancontract/project.go b/internal/contract/plancontract/project.go similarity index 95% rename from internal/plancontract/project.go rename to internal/contract/plancontract/project.go index ef751a5f1b..0e10989ce9 100644 --- a/internal/plancontract/project.go +++ b/internal/contract/plancontract/project.go @@ -1,6 +1,6 @@ package plancontract -import "reasonix/internal/evidence" +import "reasonix/internal/runtime/evidence" // ProjectTodos renders the plan as the serial task list a host seeds on // approval: phases at level 0, sub-steps at level 1, first unfinished item made diff --git a/internal/plancontract/project_test.go b/internal/contract/plancontract/project_test.go similarity index 98% rename from internal/plancontract/project_test.go rename to internal/contract/plancontract/project_test.go index 37d58d1724..9ce7aaf3d8 100644 --- a/internal/plancontract/project_test.go +++ b/internal/contract/plancontract/project_test.go @@ -3,7 +3,7 @@ package plancontract import ( "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) func TestProjectTodosBuildsTheTwoLevelList(t *testing.T) { diff --git a/internal/plancontract/render.go b/internal/contract/plancontract/render.go similarity index 100% rename from internal/plancontract/render.go rename to internal/contract/plancontract/render.go diff --git a/internal/plancontract/render_test.go b/internal/contract/plancontract/render_test.go similarity index 88% rename from internal/plancontract/render_test.go rename to internal/contract/plancontract/render_test.go index 56752d6efa..a465a4e69f 100644 --- a/internal/plancontract/render_test.go +++ b/internal/contract/plancontract/render_test.go @@ -38,19 +38,19 @@ func listItems(text string) []string { func richPlan() Plan { return Plan{ Objective: "make the cache key model-aware", - Assumptions: []Assumption{{Text: "- warm caches are disposable", Confirm: "rg cacheKey internal/provider"}}, + Assumptions: []Assumption{{Text: "- warm caches are disposable", Confirm: "rg cacheKey internal/contract/provider"}}, NonGoals: []string{"1. rewriting the retry loop"}, Steps: []Step{ { ID: "p1", Title: "thread the model ref through", - VerifiedFiles: []string{"internal/provider/cache.go"}, - CandidateFiles: []string{"internal/boot/boot.go"}, + VerifiedFiles: []string{"internal/contract/provider/cache.go"}, + CandidateFiles: []string{"internal/assembly/boot/boot.go"}, Risks: []string{"existing warm caches invalidate once"}, }, { ID: "s1", ParentID: "p1", Title: "extend cacheKey", Acceptance: []Criterion{{Text: "two model refs never share an entry"}, {Text: "existing hits keep hitting", Regression: true}}, - Verification: []Verification{{Command: "go test ./internal/provider/", Expect: "all green"}}, + Verification: []Verification{{Command: "go test ./internal/contract/provider/", Expect: "all green"}}, }, {ID: "p2", Title: "record the hit rate"}, }, @@ -86,12 +86,12 @@ func TestRenderListItemsMatchTheProjectedTodos(t *testing.T) { func TestRenderKeepsStepDetailOffTheList(t *testing.T) { out := Render(richPlan()) for _, want := range []string{ - " verified: internal/provider/cache.go", - " candidate: internal/boot/boot.go", + " verified: internal/contract/provider/cache.go", + " candidate: internal/assembly/boot/boot.go", " risk: existing warm caches invalidate once", " accept [c1]: two model refs never share an entry", " regression [c2]: existing hits keep hitting", - " verify: go test ./internal/provider/ — all green", + " verify: go test ./internal/contract/provider/ — all green", } { if !strings.Contains(out, want+"\n") { t.Errorf("rendered plan missing detail line %q:\n%s", want, out) diff --git a/internal/planmode/context.go b/internal/contract/planmode/context.go similarity index 100% rename from internal/planmode/context.go rename to internal/contract/planmode/context.go diff --git a/internal/planmode/marker_test.go b/internal/contract/planmode/marker_test.go similarity index 100% rename from internal/planmode/marker_test.go rename to internal/contract/planmode/marker_test.go diff --git a/internal/planmode/policy.go b/internal/contract/planmode/policy.go similarity index 100% rename from internal/planmode/policy.go rename to internal/contract/planmode/policy.go diff --git a/internal/planmode/policy_test.go b/internal/contract/planmode/policy_test.go similarity index 100% rename from internal/planmode/policy_test.go rename to internal/contract/planmode/policy_test.go diff --git a/internal/planmode/reconcile_test.go b/internal/contract/planmode/reconcile_test.go similarity index 96% rename from internal/planmode/reconcile_test.go rename to internal/contract/planmode/reconcile_test.go index 5c5784d2fa..8496acaf1a 100644 --- a/internal/planmode/reconcile_test.go +++ b/internal/contract/planmode/reconcile_test.go @@ -3,10 +3,10 @@ package planmode_test import ( "testing" - "reasonix/internal/planmode" - "reasonix/internal/tool" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/tool" - _ "reasonix/internal/tool/builtin" + _ "reasonix/internal/tools/builtin" ) // effectOf mirrors the agent's own derivation so this reconciliation measures diff --git a/internal/planmode/state.go b/internal/contract/planmode/state.go similarity index 100% rename from internal/planmode/state.go rename to internal/contract/planmode/state.go diff --git a/internal/planmode/state_test.go b/internal/contract/planmode/state_test.go similarity index 100% rename from internal/planmode/state_test.go rename to internal/contract/planmode/state_test.go diff --git a/internal/provider/chunk.go b/internal/contract/provider/chunk.go similarity index 100% rename from internal/provider/chunk.go rename to internal/contract/provider/chunk.go diff --git a/internal/provider/config.go b/internal/contract/provider/config.go similarity index 100% rename from internal/provider/config.go rename to internal/contract/provider/config.go diff --git a/internal/provider/context_overflow.go b/internal/contract/provider/context_overflow.go similarity index 100% rename from internal/provider/context_overflow.go rename to internal/contract/provider/context_overflow.go diff --git a/internal/provider/context_overflow_test.go b/internal/contract/provider/context_overflow_test.go similarity index 100% rename from internal/provider/context_overflow_test.go rename to internal/contract/provider/context_overflow_test.go diff --git a/internal/provider/endpoint_anthropic.go b/internal/contract/provider/endpoint_anthropic.go similarity index 100% rename from internal/provider/endpoint_anthropic.go rename to internal/contract/provider/endpoint_anthropic.go diff --git a/internal/provider/image_data_url.go b/internal/contract/provider/image_data_url.go similarity index 100% rename from internal/provider/image_data_url.go rename to internal/contract/provider/image_data_url.go diff --git a/internal/provider/image_test.go b/internal/contract/provider/image_test.go similarity index 100% rename from internal/provider/image_test.go rename to internal/contract/provider/image_test.go diff --git a/internal/provider/local_metadata.go b/internal/contract/provider/local_metadata.go similarity index 100% rename from internal/provider/local_metadata.go rename to internal/contract/provider/local_metadata.go diff --git a/internal/provider/output_budget.go b/internal/contract/provider/output_budget.go similarity index 100% rename from internal/provider/output_budget.go rename to internal/contract/provider/output_budget.go diff --git a/internal/provider/pairing_probe_test.go b/internal/contract/provider/pairing_probe_test.go similarity index 100% rename from internal/provider/pairing_probe_test.go rename to internal/contract/provider/pairing_probe_test.go diff --git a/internal/provider/projection.go b/internal/contract/provider/projection.go similarity index 100% rename from internal/provider/projection.go rename to internal/contract/provider/projection.go diff --git a/internal/provider/provider.go b/internal/contract/provider/provider.go similarity index 99% rename from internal/provider/provider.go rename to internal/contract/provider/provider.go index ce035b71a5..d0e2feb2ef 100644 --- a/internal/provider/provider.go +++ b/internal/contract/provider/provider.go @@ -14,7 +14,7 @@ import ( "slices" "strings" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" ) // Role is the role of a message. diff --git a/internal/provider/provider_test.go b/internal/contract/provider/provider_test.go similarity index 100% rename from internal/provider/provider_test.go rename to internal/contract/provider/provider_test.go diff --git a/internal/provider/resolver.go b/internal/contract/provider/resolver.go similarity index 100% rename from internal/provider/resolver.go rename to internal/contract/provider/resolver.go diff --git a/internal/provider/retry.go b/internal/contract/provider/retry.go similarity index 100% rename from internal/provider/retry.go rename to internal/contract/provider/retry.go diff --git a/internal/provider/retry_test.go b/internal/contract/provider/retry_test.go similarity index 100% rename from internal/provider/retry_test.go rename to internal/contract/provider/retry_test.go diff --git a/internal/provider/schema_canonicalize.go b/internal/contract/provider/schema_canonicalize.go similarity index 100% rename from internal/provider/schema_canonicalize.go rename to internal/contract/provider/schema_canonicalize.go diff --git a/internal/provider/schema_canonicalize_test.go b/internal/contract/provider/schema_canonicalize_test.go similarity index 100% rename from internal/provider/schema_canonicalize_test.go rename to internal/contract/provider/schema_canonicalize_test.go diff --git a/internal/provider/schema_dialect.go b/internal/contract/provider/schema_dialect.go similarity index 100% rename from internal/provider/schema_dialect.go rename to internal/contract/provider/schema_dialect.go diff --git a/internal/provider/schema_dialect_test.go b/internal/contract/provider/schema_dialect_test.go similarity index 100% rename from internal/provider/schema_dialect_test.go rename to internal/contract/provider/schema_dialect_test.go diff --git a/internal/provider/schema_error.go b/internal/contract/provider/schema_error.go similarity index 100% rename from internal/provider/schema_error.go rename to internal/contract/provider/schema_error.go diff --git a/internal/provider/schema_error_test.go b/internal/contract/provider/schema_error_test.go similarity index 100% rename from internal/provider/schema_error_test.go rename to internal/contract/provider/schema_error_test.go diff --git a/internal/provider/schema_validate.go b/internal/contract/provider/schema_validate.go similarity index 100% rename from internal/provider/schema_validate.go rename to internal/contract/provider/schema_validate.go diff --git a/internal/provider/schema_validate_test.go b/internal/contract/provider/schema_validate_test.go similarity index 98% rename from internal/provider/schema_validate_test.go rename to internal/contract/provider/schema_validate_test.go index 8b0b401f03..c01d1fd27b 100644 --- a/internal/provider/schema_validate_test.go +++ b/internal/contract/provider/schema_validate_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestValidateToolSchemaAcceptsValidDrafts(t *testing.T) { diff --git a/internal/provider/stream_error.go b/internal/contract/provider/stream_error.go similarity index 100% rename from internal/provider/stream_error.go rename to internal/contract/provider/stream_error.go diff --git a/internal/provider/stream_error_test.go b/internal/contract/provider/stream_error_test.go similarity index 100% rename from internal/provider/stream_error_test.go rename to internal/contract/provider/stream_error_test.go diff --git a/internal/provider/stream_interrupt_test.go b/internal/contract/provider/stream_interrupt_test.go similarity index 100% rename from internal/provider/stream_interrupt_test.go rename to internal/contract/provider/stream_interrupt_test.go diff --git a/internal/provider/stream_payload.go b/internal/contract/provider/stream_payload.go similarity index 100% rename from internal/provider/stream_payload.go rename to internal/contract/provider/stream_payload.go diff --git a/internal/provider/streaminterrupt.go b/internal/contract/provider/streaminterrupt.go similarity index 98% rename from internal/provider/streaminterrupt.go rename to internal/contract/provider/streaminterrupt.go index 7b85551057..426fc738d5 100644 --- a/internal/provider/streaminterrupt.go +++ b/internal/contract/provider/streaminterrupt.go @@ -4,7 +4,7 @@ import ( "errors" "io" - "reasonix/internal/neterr" + "reasonix/internal/base/neterr" ) // Fixed stream-interrupt reasons for observability. Values are a closed enum diff --git a/internal/provider/tool_execution_cache_test.go b/internal/contract/provider/tool_execution_cache_test.go similarity index 100% rename from internal/provider/tool_execution_cache_test.go rename to internal/contract/provider/tool_execution_cache_test.go diff --git a/internal/provider/usage.go b/internal/contract/provider/usage.go similarity index 100% rename from internal/provider/usage.go rename to internal/contract/provider/usage.go diff --git a/internal/surface/surface.go b/internal/contract/surface/surface.go similarity index 100% rename from internal/surface/surface.go rename to internal/contract/surface/surface.go diff --git a/internal/surface/surface_test.go b/internal/contract/surface/surface_test.go similarity index 100% rename from internal/surface/surface_test.go rename to internal/contract/surface/surface_test.go diff --git a/internal/taskcontract/proof.go b/internal/contract/taskcontract/proof.go similarity index 96% rename from internal/taskcontract/proof.go rename to internal/contract/taskcontract/proof.go index 8fe089e7f7..7c5dbd05f4 100644 --- a/internal/taskcontract/proof.go +++ b/internal/contract/taskcontract/proof.go @@ -1,6 +1,6 @@ package taskcontract -import "reasonix/internal/evidence" +import "reasonix/internal/runtime/evidence" // refFor classifies one receipt as the kind of proof it carries. For a // verification, a shell reports one status for the whole command, so the host's diff --git a/internal/taskcontract/proof_test.go b/internal/contract/taskcontract/proof_test.go similarity index 98% rename from internal/taskcontract/proof_test.go rename to internal/contract/taskcontract/proof_test.go index a9e1ec81af..a0dda12c66 100644 --- a/internal/taskcontract/proof_test.go +++ b/internal/contract/taskcontract/proof_test.go @@ -3,7 +3,7 @@ package taskcontract import ( "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // A suite whose exit status the shell hid neither satisfies a declared check diff --git a/internal/taskcontract/taskcontract.go b/internal/contract/taskcontract/taskcontract.go similarity index 99% rename from internal/taskcontract/taskcontract.go rename to internal/contract/taskcontract/taskcontract.go index 3974e8ff83..db06204364 100644 --- a/internal/taskcontract/taskcontract.go +++ b/internal/contract/taskcontract/taskcontract.go @@ -10,7 +10,7 @@ import ( "slices" "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // Risk is the highest risk any upstream signal assigned to the task. diff --git a/internal/taskcontract/taskcontract_test.go b/internal/contract/taskcontract/taskcontract_test.go similarity index 99% rename from internal/taskcontract/taskcontract_test.go rename to internal/contract/taskcontract/taskcontract_test.go index 0790f5f1a0..732c0b62fb 100644 --- a/internal/taskcontract/taskcontract_test.go +++ b/internal/contract/taskcontract/taskcontract_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // atomicFixture is the one-requirement, one-check shape the delivery gates diff --git a/internal/tool/blocked.go b/internal/contract/tool/blocked.go similarity index 100% rename from internal/tool/blocked.go rename to internal/contract/tool/blocked.go diff --git a/internal/tool/compress.go b/internal/contract/tool/compress.go similarity index 100% rename from internal/tool/compress.go rename to internal/contract/tool/compress.go diff --git a/internal/tool/configwrite.go b/internal/contract/tool/configwrite.go similarity index 100% rename from internal/tool/configwrite.go rename to internal/contract/tool/configwrite.go diff --git a/internal/tool/context_budget.go b/internal/contract/tool/context_budget.go similarity index 100% rename from internal/tool/context_budget.go rename to internal/contract/tool/context_budget.go diff --git a/internal/tool/contextual_reason_test.go b/internal/contract/tool/contextual_reason_test.go similarity index 97% rename from internal/tool/contextual_reason_test.go rename to internal/contract/tool/contextual_reason_test.go index 60230882bd..eeaf8a86da 100644 --- a/internal/tool/contextual_reason_test.go +++ b/internal/contract/tool/contextual_reason_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/tool" - _ "reasonix/internal/tool/builtin" + "reasonix/internal/contract/tool" + _ "reasonix/internal/tools/builtin" ) // A tool that can be out of context says what would put it back in, and says diff --git a/internal/tool/contract.go b/internal/contract/tool/contract.go similarity index 98% rename from internal/tool/contract.go rename to internal/contract/tool/contract.go index 465585087c..17c8a4c22e 100644 --- a/internal/tool/contract.go +++ b/internal/contract/tool/contract.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // ContractEntry is the provider-visible contract for a tool schema snapshot. diff --git a/internal/tool/contract_lock_test.go b/internal/contract/tool/contract_lock_test.go similarity index 100% rename from internal/tool/contract_lock_test.go rename to internal/contract/tool/contract_lock_test.go diff --git a/internal/tool/contract_test.go b/internal/contract/tool/contract_test.go similarity index 95% rename from internal/tool/contract_test.go rename to internal/contract/tool/contract_test.go index 1d991eea7c..ae515071b0 100644 --- a/internal/tool/contract_test.go +++ b/internal/contract/tool/contract_test.go @@ -10,16 +10,16 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" - _ "reasonix/internal/tool/builtin" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + _ "reasonix/internal/tools/builtin" ) // updateContract rewrites the document instead of failing, for the round that // changed a description on purpose. var updateContract = flag.Bool("update-contract", false, "rewrite docs/TOOL_CONTRACT.md from the registry") -const contractPath = "../../docs/TOOL_CONTRACT.md" +const contractPath = "../../../docs/TOOL_CONTRACT.md" func TestBuiltinToolContractDocumentation(t *testing.T) { entries := tool.BuiltinContractEntries() @@ -59,7 +59,7 @@ func TestBuiltinToolContractDocumentation(t *testing.T) { return } t.Errorf("docs/TOOL_CONTRACT.md no longer says what the registry does.\n"+ - "Regenerate it: go test ./internal/tool -run TestBuiltinToolContractDocumentation -update-contract\n%s", + "Regenerate it: go test ./internal/contract/tool -run TestBuiltinToolContractDocumentation -update-contract\n%s", firstDifference(string(doc), next)) } diff --git a/internal/tool/goal.go b/internal/contract/tool/goal.go similarity index 100% rename from internal/tool/goal.go rename to internal/contract/tool/goal.go diff --git a/internal/tool/goal_test.go b/internal/contract/tool/goal_test.go similarity index 100% rename from internal/tool/goal_test.go rename to internal/contract/tool/goal_test.go diff --git a/internal/tool/permission_args.go b/internal/contract/tool/permission_args.go similarity index 100% rename from internal/tool/permission_args.go rename to internal/contract/tool/permission_args.go diff --git a/internal/tool/preview_test.go b/internal/contract/tool/preview_test.go similarity index 98% rename from internal/tool/preview_test.go rename to internal/contract/tool/preview_test.go index 9f6519bd3c..d5b522de3d 100644 --- a/internal/tool/preview_test.go +++ b/internal/contract/tool/preview_test.go @@ -6,7 +6,7 @@ import ( "errors" "testing" - "reasonix/internal/diff" + "reasonix/internal/base/diff" ) type fakeWriter struct { diff --git a/internal/tool/progress.go b/internal/contract/tool/progress.go similarity index 100% rename from internal/tool/progress.go rename to internal/contract/tool/progress.go diff --git a/internal/tool/provider_surface_test.go b/internal/contract/tool/provider_surface_test.go similarity index 98% rename from internal/tool/provider_surface_test.go rename to internal/contract/tool/provider_surface_test.go index e14d7144ab..8bc9c51040 100644 --- a/internal/tool/provider_surface_test.go +++ b/internal/contract/tool/provider_surface_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) type surfaceTool struct { diff --git a/internal/tool/recall.go b/internal/contract/tool/recall.go similarity index 100% rename from internal/tool/recall.go rename to internal/contract/tool/recall.go diff --git a/internal/tool/refusal.go b/internal/contract/tool/refusal.go similarity index 100% rename from internal/tool/refusal.go rename to internal/contract/tool/refusal.go diff --git a/internal/tool/registry_canon_test.go b/internal/contract/tool/registry_canon_test.go similarity index 100% rename from internal/tool/registry_canon_test.go rename to internal/contract/tool/registry_canon_test.go diff --git a/internal/tool/registry_test.go b/internal/contract/tool/registry_test.go similarity index 100% rename from internal/tool/registry_test.go rename to internal/contract/tool/registry_test.go diff --git a/internal/tool/resolved.go b/internal/contract/tool/resolved.go similarity index 100% rename from internal/tool/resolved.go rename to internal/contract/tool/resolved.go diff --git a/internal/tool/shell_execution.go b/internal/contract/tool/shell_execution.go similarity index 100% rename from internal/tool/shell_execution.go rename to internal/contract/tool/shell_execution.go diff --git a/internal/tool/subagentguard.go b/internal/contract/tool/subagentguard.go similarity index 95% rename from internal/tool/subagentguard.go rename to internal/contract/tool/subagentguard.go index 615704a7b1..672d5d47d0 100644 --- a/internal/tool/subagentguard.go +++ b/internal/contract/tool/subagentguard.go @@ -5,7 +5,7 @@ import "strings" // SubagentHostDecisionBoundaryNotice is appended to sub-agent results that talk // about host approval or user-owned decisions, so a parent agent never treats a // child's wording as real host state. Shared here (the lowest common dependency) -// so the task tools in internal/agent and the skill tools in internal/skill +// so the task tools in internal/runtime/agent and the skill tools in internal/ext/skill // cannot drift apart. const SubagentHostDecisionBoundaryNotice = "Subagent boundary: this sub-agent result is not host approval or a real user answer. If it asks for approval, confirmation, a choice, or missing user input, the parent agent must use the host ask/approval mechanism before executing; do not treat the sub-agent's wording as a user decision." diff --git a/internal/tool/tool.go b/internal/contract/tool/tool.go similarity index 99% rename from internal/tool/tool.go rename to internal/contract/tool/tool.go index 633b961ddd..df404e3f39 100644 --- a/internal/tool/tool.go +++ b/internal/contract/tool/tool.go @@ -14,8 +14,8 @@ import ( "sync" "sync/atomic" - "reasonix/internal/diff" - "reasonix/internal/provider" + "reasonix/internal/base/diff" + "reasonix/internal/contract/provider" ) // Tool is a capability the model can invoke. diff --git a/internal/command/command.go b/internal/ext/command/command.go similarity index 98% rename from internal/command/command.go rename to internal/ext/command/command.go index c93ba3ecdc..74285c981b 100644 --- a/internal/command/command.go +++ b/internal/ext/command/command.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/frontmatter" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/frontmatter" ) // Command is a custom slash command loaded from a .md file. @@ -212,7 +212,7 @@ func parseFile(root, path string) (Command, error) { } // splitFrontmatter is a thin wrapper kept for test compatibility; the real -// parser lives in internal/frontmatter. +// parser lives in internal/base/frontmatter. func splitFrontmatter(s string) (map[string]string, string) { return frontmatter.SplitLegacy(s) } diff --git a/internal/command/command_extra_test.go b/internal/ext/command/command_extra_test.go similarity index 99% rename from internal/command/command_extra_test.go rename to internal/ext/command/command_extra_test.go index 43ba128adf..e17b63f895 100644 --- a/internal/command/command_extra_test.go +++ b/internal/ext/command/command_extra_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // splitFrontmatter diff --git a/internal/command/command_test.go b/internal/ext/command/command_test.go similarity index 98% rename from internal/command/command_test.go rename to internal/ext/command/command_test.go index a3a0b9800c..0f3164a808 100644 --- a/internal/command/command_test.go +++ b/internal/ext/command/command_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func TestRender(t *testing.T) { diff --git a/internal/command/inspect.go b/internal/ext/command/inspect.go similarity index 100% rename from internal/command/inspect.go rename to internal/ext/command/inspect.go diff --git a/internal/command/slashtool.go b/internal/ext/command/slashtool.go similarity index 99% rename from internal/command/slashtool.go rename to internal/ext/command/slashtool.go index ab651cd5cc..fc99db67a3 100644 --- a/internal/command/slashtool.go +++ b/internal/ext/command/slashtool.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // SlashEntry is one invocable slash command exposed to the model through the diff --git a/internal/command/slashtool_test.go b/internal/ext/command/slashtool_test.go similarity index 99% rename from internal/command/slashtool_test.go rename to internal/ext/command/slashtool_test.go index b13743c41b..b343f65172 100644 --- a/internal/command/slashtool_test.go +++ b/internal/ext/command/slashtool_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func runSlash(t *testing.T, tl interface { diff --git a/internal/command/symlink_test.go b/internal/ext/command/symlink_test.go similarity index 97% rename from internal/command/symlink_test.go rename to internal/ext/command/symlink_test.go index c8b559b069..1002b3f2b3 100644 --- a/internal/command/symlink_test.go +++ b/internal/ext/command/symlink_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestLoadFollowsSymlinks verifies command discovery follows symlinked diff --git a/internal/extension/adapters.go b/internal/ext/extension/adapters.go similarity index 95% rename from internal/extension/adapters.go rename to internal/ext/extension/adapters.go index f7f8a674f4..09f071dee0 100644 --- a/internal/extension/adapters.go +++ b/internal/ext/extension/adapters.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "reasonix/internal/command" - "reasonix/internal/hook" - "reasonix/internal/plugin" - "reasonix/internal/provider" - "reasonix/internal/skill" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/command" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" ) // Each function here maps one already-discovered record onto one Contribution. @@ -134,7 +134,7 @@ func MCPServerContribution(spec plugin.Spec) Contribution { // mcpScope derives the kernel tier from a spec's provenance. Package is the // strongest signal — it means an installed plugin brought the server along; // ConfigSource distinguishes project/workspace config from user-level config -// (see internal/config.MCPConfigSource for the value set). +// (see internal/contract/config.MCPConfigSource for the value set). func mcpScope(spec plugin.Spec) (Scope, string) { configSource := strings.TrimSpace(spec.ConfigSource) if spec.Package != "" || configSource == "plugin_package" { diff --git a/internal/extension/bench_threshold_test.go b/internal/ext/extension/bench_threshold_test.go similarity index 100% rename from internal/extension/bench_threshold_test.go rename to internal/ext/extension/bench_threshold_test.go diff --git a/internal/extension/benchmark_test.go b/internal/ext/extension/benchmark_test.go similarity index 98% rename from internal/extension/benchmark_test.go rename to internal/ext/extension/benchmark_test.go index d2fbc4844e..318c367a55 100644 --- a/internal/extension/benchmark_test.go +++ b/internal/ext/extension/benchmark_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extensioncontract" ) // BenchmarkExtensionKernelStartup measures the immutable snapshot assembly diff --git a/internal/extension/builder.go b/internal/ext/extension/builder.go similarity index 99% rename from internal/extension/builder.go rename to internal/ext/extension/builder.go index 5288b8f5a2..ee1c0f5a23 100644 --- a/internal/extension/builder.go +++ b/internal/ext/extension/builder.go @@ -7,9 +7,9 @@ import ( "maps" "strings" - "reasonix/internal/extensioncontract" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extensioncontract" ) // Activator binds live resources (MCP sidecars, watchers) to a freshly diff --git a/internal/extension/builder_test.go b/internal/ext/extension/builder_test.go similarity index 99% rename from internal/extension/builder_test.go rename to internal/ext/extension/builder_test.go index a583edb438..c5c5a507f4 100644 --- a/internal/extension/builder_test.go +++ b/internal/ext/extension/builder_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // staticContributor returns a contributor with a fixed name and contribution diff --git a/internal/extension/catalog.go b/internal/ext/extension/catalog.go similarity index 100% rename from internal/extension/catalog.go rename to internal/ext/extension/catalog.go diff --git a/internal/extension/catalog_test.go b/internal/ext/extension/catalog_test.go similarity index 99% rename from internal/extension/catalog_test.go rename to internal/ext/extension/catalog_test.go index 2d5f3c3ee4..cd2eea5e47 100644 --- a/internal/extension/catalog_test.go +++ b/internal/ext/extension/catalog_test.go @@ -3,7 +3,7 @@ package extension import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func src(scope Scope, pluginID, origin string) ContributionSource { diff --git a/internal/extension/component_status.go b/internal/ext/extension/component_status.go similarity index 100% rename from internal/extension/component_status.go rename to internal/ext/extension/component_status.go diff --git a/internal/extension/conflict_collect_test.go b/internal/ext/extension/conflict_collect_test.go similarity index 100% rename from internal/extension/conflict_collect_test.go rename to internal/ext/extension/conflict_collect_test.go diff --git a/internal/extension/conformance/conformance_test.go b/internal/ext/extension/conformance/conformance_test.go similarity index 98% rename from internal/extension/conformance/conformance_test.go rename to internal/ext/extension/conformance/conformance_test.go index 75e3e2f5c3..d0db7485c8 100644 --- a/internal/extension/conformance/conformance_test.go +++ b/internal/ext/extension/conformance/conformance_test.go @@ -1,7 +1,7 @@ // Package conformance runs the Host↔SDK bidirectional conformance suite: the // SDK's reference example (sdk/go/examples/fullsidecar) is built once per // test run and driven against the real host sidecar client -// (internal/extension/sidecar) over its stdin/stdout, plus a raw-frame driver +// (internal/ext/extension/sidecar) over its stdin/stdout, plus a raw-frame driver // for the transport-level cases (unknown method, oversized frame, bounded // shutdown exit status). The suite is hermetic: temp dirs, no network, no // real providers. @@ -22,10 +22,10 @@ import ( "testing" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/rpcwire" - "reasonix/internal/extension/sidecar" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/rpcwire" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/pluginpkg" ) // examplePath is the built fullsidecar binary, shared by every test. @@ -47,7 +47,7 @@ func TestMain(m *testing.M) { fmt.Fprintln(os.Stderr, "conformance: cannot locate source root") os.Exit(1) } - sdkDir := filepath.Join(filepath.Dir(thisFile), "..", "..", "..", "sdk", "go") + sdkDir := filepath.Join(filepath.Dir(thisFile), "..", "..", "..", "..", "sdk", "go") exampleRoot = filepath.Join(sdkDir, "examples", "fullsidecar") dir, err := os.MkdirTemp("", "fullsidecar-conformance-") if err != nil { diff --git a/internal/extension/conformance/installed_fixture_test.go b/internal/ext/extension/conformance/installed_fixture_test.go similarity index 97% rename from internal/extension/conformance/installed_fixture_test.go rename to internal/ext/extension/conformance/installed_fixture_test.go index b4cc3a7450..b9a6e63fde 100644 --- a/internal/extension/conformance/installed_fixture_test.go +++ b/internal/ext/extension/conformance/installed_fixture_test.go @@ -7,11 +7,11 @@ import ( "runtime" "testing" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/sidecar" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/sidecar" + "reasonix/internal/ext/pluginpkg" ) func copyFixtureFile(t *testing.T, src, dst string, mode os.FileMode) { diff --git a/internal/extension/conformance/raw_test.go b/internal/ext/extension/conformance/raw_test.go similarity index 98% rename from internal/extension/conformance/raw_test.go rename to internal/ext/extension/conformance/raw_test.go index b589d532a0..efe5cddda4 100644 --- a/internal/extension/conformance/raw_test.go +++ b/internal/ext/extension/conformance/raw_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/rpcwire" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/rpcwire" ) // rawSidecar drives the example binary directly over hand-written JSON-RPC diff --git a/internal/extension/contributor.go b/internal/ext/extension/contributor.go similarity index 100% rename from internal/extension/contributor.go rename to internal/ext/extension/contributor.go diff --git a/internal/extension/dependency.go b/internal/ext/extension/dependency.go similarity index 99% rename from internal/extension/dependency.go rename to internal/ext/extension/dependency.go index d10dcace69..6a6aa13690 100644 --- a/internal/extension/dependency.go +++ b/internal/ext/extension/dependency.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extensioncontract" ) // ComponentID is the stable identity of one lifecycle component (initially one diff --git a/internal/extension/dependency_test.go b/internal/ext/extension/dependency_test.go similarity index 99% rename from internal/extension/dependency_test.go rename to internal/ext/extension/dependency_test.go index ae59a88cea..1b3644e1fe 100644 --- a/internal/extension/dependency_test.go +++ b/internal/ext/extension/dependency_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extensioncontract" ) func cap(ns, kind, id, ver, hash string) extensioncontract.Capability { diff --git a/internal/extension/dispatch/benchmark_test.go b/internal/ext/extension/dispatch/benchmark_test.go similarity index 97% rename from internal/extension/dispatch/benchmark_test.go rename to internal/ext/extension/dispatch/benchmark_test.go index 7901d4e4c5..dc61472a72 100644 --- a/internal/extension/dispatch/benchmark_test.go +++ b/internal/ext/extension/dispatch/benchmark_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" ) type benchmarkClient struct{} diff --git a/internal/extension/dispatch/dispatch.go b/internal/ext/extension/dispatch/dispatch.go similarity index 99% rename from internal/extension/dispatch/dispatch.go rename to internal/ext/extension/dispatch/dispatch.go index e94fe30fff..6863ba8c72 100644 --- a/internal/extension/dispatch/dispatch.go +++ b/internal/ext/extension/dispatch/dispatch.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" ) // Client is the subset of sidecar.Client the dispatcher needs, abstracted for diff --git a/internal/extension/dispatch/dispatch_test.go b/internal/ext/extension/dispatch/dispatch_test.go similarity index 99% rename from internal/extension/dispatch/dispatch_test.go rename to internal/ext/extension/dispatch/dispatch_test.go index e3afc7b743..2e1bf671d9 100644 --- a/internal/extension/dispatch/dispatch_test.go +++ b/internal/ext/extension/dispatch/dispatch_test.go @@ -10,9 +10,9 @@ import ( "sync" "testing" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/sidecar" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/sidecar" ) // The production Client interface exists so the real sidecar client drops in @@ -20,7 +20,7 @@ import ( var _ Client = (*sidecar.Client)(nil) // testSecret is a credential shape secrets.RedactCredentials reliably masks -// (it appears in internal/secrets' own tests). +// (it appears in internal/base/secrets' own tests). const testSecret = "sk-real-secret-value-123456" func interceptor(pluginID string, point extension.InterceptorPoint, priority int) extension.Contribution { diff --git a/internal/extension/dispatch/fake_test.go b/internal/ext/extension/dispatch/fake_test.go similarity index 98% rename from internal/extension/dispatch/fake_test.go rename to internal/ext/extension/dispatch/fake_test.go index c9d509dfa9..a98179f4c8 100644 --- a/internal/extension/dispatch/fake_test.go +++ b/internal/ext/extension/dispatch/fake_test.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension/protocol" ) // recordedCall captures one intercept or event call a fake client received. diff --git a/internal/extension/dispatch/payloads.go b/internal/ext/extension/dispatch/payloads.go similarity index 99% rename from internal/extension/dispatch/payloads.go rename to internal/ext/extension/dispatch/payloads.go index a8446920fe..bec9808c18 100644 --- a/internal/extension/dispatch/payloads.go +++ b/internal/ext/extension/dispatch/payloads.go @@ -7,8 +7,8 @@ import ( "fmt" "io" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" ) // Host payload DTOs: one struct per intercept point. These are the host-side diff --git a/internal/extension/doc.go b/internal/ext/extension/doc.go similarity index 91% rename from internal/extension/doc.go rename to internal/ext/extension/doc.go index 2bce9d294d..9596912cdb 100644 --- a/internal/extension/doc.go +++ b/internal/ext/extension/doc.go @@ -11,11 +11,11 @@ // // The kernel exists so that shadowing, conflicts, and ordering stop being // emergent side effects of whichever discovery path ran last. Discovery still -// lives in the existing packages (internal/skill, internal/command, -// internal/hook, internal/tool, internal/plugin, internal/provider), which +// lives in the existing packages (internal/ext/skill, internal/ext/command, +// internal/ext/hook, internal/contract/tool, internal/ext/plugin, internal/contract/provider), which // run it and hand the kernel the resolved records; adapters.go maps one such // record onto one Contribution. KindPrompt and KindTheme have no contributor: -// a package's prompts are found with its commands, and internal/theme reads +// a package's prompts are found with its commands, and internal/ext/theme reads // its themes. Winner rules are resolved here, // once, identically for every caller: a higher-tier scope shadows a lower one // for the same canonical ID, same-tier duplicates from different sources are diff --git a/internal/extension/effectscope.go b/internal/ext/extension/effectscope.go similarity index 100% rename from internal/extension/effectscope.go rename to internal/ext/extension/effectscope.go diff --git a/internal/extension/effectscope_test.go b/internal/ext/extension/effectscope_test.go similarity index 100% rename from internal/extension/effectscope_test.go rename to internal/ext/extension/effectscope_test.go diff --git a/internal/extension/file_compensate.go b/internal/ext/extension/file_compensate.go similarity index 100% rename from internal/extension/file_compensate.go rename to internal/ext/extension/file_compensate.go diff --git a/internal/extension/file_compensate_test.go b/internal/ext/extension/file_compensate_test.go similarity index 98% rename from internal/extension/file_compensate_test.go rename to internal/ext/extension/file_compensate_test.go index c6efe16268..cd6a870eb8 100644 --- a/internal/extension/file_compensate_test.go +++ b/internal/ext/extension/file_compensate_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestFilePriorCompensateRestore(t *testing.T) { diff --git a/internal/extension/golden_fixtures_test.go b/internal/ext/extension/golden_fixtures_test.go similarity index 98% rename from internal/extension/golden_fixtures_test.go rename to internal/ext/extension/golden_fixtures_test.go index 405a8ec150..3981f4040e 100644 --- a/internal/extension/golden_fixtures_test.go +++ b/internal/ext/extension/golden_fixtures_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) func fixturesDir(t *testing.T) string { diff --git a/internal/extension/host_stream.go b/internal/ext/extension/host_stream.go similarity index 100% rename from internal/extension/host_stream.go rename to internal/ext/extension/host_stream.go diff --git a/internal/extension/host_stream_test.go b/internal/ext/extension/host_stream_test.go similarity index 100% rename from internal/extension/host_stream_test.go rename to internal/ext/extension/host_stream_test.go diff --git a/internal/extension/intercept.go b/internal/ext/extension/intercept.go similarity index 100% rename from internal/extension/intercept.go rename to internal/ext/extension/intercept.go diff --git a/internal/extension/intercept_test.go b/internal/ext/extension/intercept_test.go similarity index 100% rename from internal/extension/intercept_test.go rename to internal/ext/extension/intercept_test.go diff --git a/internal/extension/lifecycle.go b/internal/ext/extension/lifecycle.go similarity index 100% rename from internal/extension/lifecycle.go rename to internal/ext/extension/lifecycle.go diff --git a/internal/extension/manifest_sync_test.go b/internal/ext/extension/manifest_sync_test.go similarity index 97% rename from internal/extension/manifest_sync_test.go rename to internal/ext/extension/manifest_sync_test.go index 1611ee3910..c7a2767f2f 100644 --- a/internal/extension/manifest_sync_test.go +++ b/internal/ext/extension/manifest_sync_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) // writePluginFile writes one file inside a plugin package fixture. diff --git a/internal/extension/mcpproxy.go b/internal/ext/extension/mcpproxy.go similarity index 100% rename from internal/extension/mcpproxy.go rename to internal/ext/extension/mcpproxy.go diff --git a/internal/extension/mcpproxy_test.go b/internal/ext/extension/mcpproxy_test.go similarity index 100% rename from internal/extension/mcpproxy_test.go rename to internal/ext/extension/mcpproxy_test.go diff --git a/internal/extension/message_dedup.go b/internal/ext/extension/message_dedup.go similarity index 100% rename from internal/extension/message_dedup.go rename to internal/ext/extension/message_dedup.go diff --git a/internal/extension/message_dedup_test.go b/internal/ext/extension/message_dedup_test.go similarity index 100% rename from internal/extension/message_dedup_test.go rename to internal/ext/extension/message_dedup_test.go diff --git a/internal/extension/metrics.go b/internal/ext/extension/metrics.go similarity index 100% rename from internal/extension/metrics.go rename to internal/ext/extension/metrics.go diff --git a/internal/extension/metrics_test.go b/internal/ext/extension/metrics_test.go similarity index 100% rename from internal/extension/metrics_test.go rename to internal/ext/extension/metrics_test.go diff --git a/internal/extension/protocol/dto_content.go b/internal/ext/extension/protocol/dto_content.go similarity index 100% rename from internal/extension/protocol/dto_content.go rename to internal/ext/extension/protocol/dto_content.go diff --git a/internal/extension/protocol/dto_intercept.go b/internal/ext/extension/protocol/dto_intercept.go similarity index 100% rename from internal/extension/protocol/dto_intercept.go rename to internal/ext/extension/protocol/dto_intercept.go diff --git a/internal/extension/protocol/dto_lifecycle.go b/internal/ext/extension/protocol/dto_lifecycle.go similarity index 100% rename from internal/extension/protocol/dto_lifecycle.go rename to internal/ext/extension/protocol/dto_lifecycle.go diff --git a/internal/extension/protocol/dto_provider.go b/internal/ext/extension/protocol/dto_provider.go similarity index 99% rename from internal/extension/protocol/dto_provider.go rename to internal/ext/extension/protocol/dto_provider.go index 8d842e61e6..6ffa0d8075 100644 --- a/internal/extension/protocol/dto_provider.go +++ b/internal/ext/extension/protocol/dto_provider.go @@ -8,9 +8,9 @@ import ( // Provider DTOs: the extension-hosted provider broker. The extension holds // provider credentials and runs streams; the host only ever sees these -// credential-free public copies. Conversion to and from internal/provider +// credential-free public copies. Conversion to and from internal/contract/provider // types lives host-side in a later stage; these DTOs deliberately do not -// import internal/provider so the public wire schema stays self-contained. +// import internal/contract/provider so the public wire schema stays self-contained. // ProviderDescriptor mirrors provider.Descriptor field-for-field as a public // DTO. It never carries endpoints, credentials, headers, or env names. diff --git a/internal/extension/protocol/dto_test.go b/internal/ext/extension/protocol/dto_test.go similarity index 100% rename from internal/extension/protocol/dto_test.go rename to internal/ext/extension/protocol/dto_test.go diff --git a/internal/extension/protocol/dto_tool.go b/internal/ext/extension/protocol/dto_tool.go similarity index 100% rename from internal/extension/protocol/dto_tool.go rename to internal/ext/extension/protocol/dto_tool.go diff --git a/internal/extension/protocol/dto_ui.go b/internal/ext/extension/protocol/dto_ui.go similarity index 100% rename from internal/extension/protocol/dto_ui.go rename to internal/ext/extension/protocol/dto_ui.go diff --git a/internal/extension/protocol/dto_view.go b/internal/ext/extension/protocol/dto_view.go similarity index 100% rename from internal/extension/protocol/dto_view.go rename to internal/ext/extension/protocol/dto_view.go diff --git a/internal/extension/protocol/dto_view_test.go b/internal/ext/extension/protocol/dto_view_test.go similarity index 100% rename from internal/extension/protocol/dto_view_test.go rename to internal/ext/extension/protocol/dto_view_test.go diff --git a/internal/extension/protocol/enums.go b/internal/ext/extension/protocol/enums.go similarity index 98% rename from internal/extension/protocol/enums.go rename to internal/ext/extension/protocol/enums.go index 12af0fea30..21f90771b7 100644 --- a/internal/extension/protocol/enums.go +++ b/internal/ext/extension/protocol/enums.go @@ -38,7 +38,7 @@ const ( // InterceptEvent names one of the 17 frozen kernel hook points an extension // may intercept (extension/intercept) or observe (extension/event). The -// string values mirror internal/extension.InterceptorPoint exactly; they are +// string values mirror internal/ext/extension.InterceptorPoint exactly; they are // frozen here so the public wire contract does not depend on kernel // internals. type InterceptEvent string @@ -150,7 +150,7 @@ const ( ) // ProviderRole mirrors the provider message roles without importing -// internal/provider into the public wire schema. +// internal/contract/provider into the public wire schema. type ProviderRole string const ( diff --git a/internal/extension/protocol/errors.go b/internal/ext/extension/protocol/errors.go similarity index 99% rename from internal/extension/protocol/errors.go rename to internal/ext/extension/protocol/errors.go index 60e22f48b3..4d9b1218b6 100644 --- a/internal/extension/protocol/errors.go +++ b/internal/ext/extension/protocol/errors.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "reasonix/internal/extension/rpcwire" + "reasonix/internal/ext/extension/rpcwire" ) // DomainErrorCode is the JSON-RPC code every extension domain error uses on diff --git a/internal/extension/protocol/errors_test.go b/internal/ext/extension/protocol/errors_test.go similarity index 98% rename from internal/extension/protocol/errors_test.go rename to internal/ext/extension/protocol/errors_test.go index 1b7e0160bd..8d354b8f95 100644 --- a/internal/extension/protocol/errors_test.go +++ b/internal/ext/extension/protocol/errors_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "reasonix/internal/extension/rpcwire" + "reasonix/internal/ext/extension/rpcwire" ) func TestErrorTableCoversRequiredReasons(t *testing.T) { diff --git a/internal/extension/protocol/limits.go b/internal/ext/extension/protocol/limits.go similarity index 100% rename from internal/extension/protocol/limits.go rename to internal/ext/extension/protocol/limits.go diff --git a/internal/extension/protocol/protocol.go b/internal/ext/extension/protocol/protocol.go similarity index 100% rename from internal/extension/protocol/protocol.go rename to internal/ext/extension/protocol/protocol.go diff --git a/internal/extension/protocol/protocol_test.go b/internal/ext/extension/protocol/protocol_test.go similarity index 100% rename from internal/extension/protocol/protocol_test.go rename to internal/ext/extension/protocol/protocol_test.go diff --git a/internal/extension/protocol/registry.go b/internal/ext/extension/protocol/registry.go similarity index 100% rename from internal/extension/protocol/registry.go rename to internal/ext/extension/protocol/registry.go diff --git a/internal/extension/protocol/registry_test.go b/internal/ext/extension/protocol/registry_test.go similarity index 100% rename from internal/extension/protocol/registry_test.go rename to internal/ext/extension/protocol/registry_test.go diff --git a/internal/extension/protocol/schema.generated.json b/internal/ext/extension/protocol/schema.generated.json similarity index 100% rename from internal/extension/protocol/schema.generated.json rename to internal/ext/extension/protocol/schema.generated.json diff --git a/internal/extension/protocol/schema.go b/internal/ext/extension/protocol/schema.go similarity index 100% rename from internal/extension/protocol/schema.go rename to internal/ext/extension/protocol/schema.go diff --git a/internal/extension/protocol/schema_hash.generated.go b/internal/ext/extension/protocol/schema_hash.generated.go similarity index 100% rename from internal/extension/protocol/schema_hash.generated.go rename to internal/ext/extension/protocol/schema_hash.generated.go diff --git a/internal/extension/protocol/schema_test.go b/internal/ext/extension/protocol/schema_test.go similarity index 100% rename from internal/extension/protocol/schema_test.go rename to internal/ext/extension/protocol/schema_test.go diff --git a/internal/extension/protocol/validate.go b/internal/ext/extension/protocol/validate.go similarity index 100% rename from internal/extension/protocol/validate.go rename to internal/ext/extension/protocol/validate.go diff --git a/internal/extension/protocolgen/generate.go b/internal/ext/extension/protocolgen/generate.go similarity index 96% rename from internal/extension/protocolgen/generate.go rename to internal/ext/extension/protocolgen/generate.go index 2254fce398..188c2a71c3 100644 --- a/internal/extension/protocolgen/generate.go +++ b/internal/ext/extension/protocolgen/generate.go @@ -13,12 +13,12 @@ import ( "path/filepath" "strings" - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension/protocol" ) const ( - SchemaArtifactPath = "internal/extension/protocol/schema.generated.json" - HashArtifactPath = "internal/extension/protocol/schema_hash.generated.go" + SchemaArtifactPath = "internal/ext/extension/protocol/schema.generated.json" + HashArtifactPath = "internal/ext/extension/protocol/schema_hash.generated.go" MarkdownArtifactPath = "docs/EXTENSION_PROTOCOL.generated.md" // SDKTypesArtifactPath is the Go DTO mirror compiled into the stdlib-only // extension SDK module. diff --git a/internal/extension/protocolgen/generate_test.go b/internal/ext/extension/protocolgen/generate_test.go similarity index 97% rename from internal/extension/protocolgen/generate_test.go rename to internal/ext/extension/protocolgen/generate_test.go index ad88a05b40..7a8213ebc9 100644 --- a/internal/extension/protocolgen/generate_test.go +++ b/internal/ext/extension/protocolgen/generate_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestGeneratedArtifactsAreDeterministicAndCommitted(t *testing.T) { @@ -26,7 +26,7 @@ func TestGeneratedArtifactsAreDeterministicAndCommitted(t *testing.T) { if err := Write(temporaryRoot, first); err != nil { t.Fatal(err) } - repositoryRoot := filepath.Clean(filepath.Join("..", "..", "..")) + repositoryRoot := filepath.Clean(filepath.Join("..", "..", "..", "..")) for i, artifact := range first { if artifact.Path != second[i].Path || !bytes.Equal(artifact.Data, second[i].Data) { t.Fatalf("artifact %s is not deterministic", artifact.Path) diff --git a/internal/extension/protocolgen/sdkgo.go b/internal/ext/extension/protocolgen/sdkgo.go similarity index 99% rename from internal/extension/protocolgen/sdkgo.go rename to internal/ext/extension/protocolgen/sdkgo.go index 009fa59e81..ebba843963 100644 --- a/internal/extension/protocolgen/sdkgo.go +++ b/internal/ext/extension/protocolgen/sdkgo.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension/protocol" ) // The SDK types artifact (SDKTypesArtifactPath in generate.go) is produced @@ -162,7 +162,7 @@ func generateSDKTypesGo() ([]byte, error) { out.WriteString("\n") out.WriteString("// Package extension: Extension Protocol v2 wire DTOs, enums, method\n") out.WriteString("// names, frozen limits, and the frozen error table, mirrored from the\n") - out.WriteString("// host's internal/extension/protocol package. Behavior (validators,\n") + out.WriteString("// host's internal/ext/extension/protocol package. Behavior (validators,\n") out.WriteString("// error constructors, helpers) lives in the handwritten files.\n") out.WriteString("package extension\n") out.WriteString("\n") diff --git a/internal/extension/providerconv/providerconv.go b/internal/ext/extension/providerconv/providerconv.go similarity index 96% rename from internal/extension/providerconv/providerconv.go rename to internal/ext/extension/providerconv/providerconv.go index b46962273c..0c86b4f19b 100644 --- a/internal/extension/providerconv/providerconv.go +++ b/internal/ext/extension/providerconv/providerconv.go @@ -1,6 +1,6 @@ // Package providerconv holds the host-side conversions between -// internal/provider values and the public Extension Protocol v2 wire DTOs. -// The protocol package deliberately does not import internal/provider, so +// internal/contract/provider values and the public Extension Protocol v2 wire DTOs. +// The protocol package deliberately does not import internal/contract/provider, so // every host surface that moves provider data across the extension boundary — // the agent's intercept wiring and the sidecar provider adapter // — shares these helpers. Wire DTOs never carry credentials: @@ -11,9 +11,9 @@ package providerconv import ( "errors" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/protocol" ) // MessagesToProtocol copies provider messages into their public wire form, diff --git a/internal/extension/providerconv/providerconv_test.go b/internal/ext/extension/providerconv/providerconv_test.go similarity index 98% rename from internal/extension/providerconv/providerconv_test.go rename to internal/ext/extension/providerconv/providerconv_test.go index 57d8ce1957..d7e824fc89 100644 --- a/internal/extension/providerconv/providerconv_test.go +++ b/internal/ext/extension/providerconv/providerconv_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/protocol" ) // Round trips through the wire DTOs must preserve every provider-visible diff --git a/internal/extension/providerext/provider.go b/internal/ext/extension/providerext/provider.go similarity index 98% rename from internal/extension/providerext/provider.go rename to internal/ext/extension/providerext/provider.go index a1fb2bd7ed..7f7519848f 100644 --- a/internal/extension/providerext/provider.go +++ b/internal/ext/extension/providerext/provider.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/providerconv" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/providerconv" ) // Provider is the host-side handle for one extension-hosted provider ref. diff --git a/internal/extension/providerext/providerext.go b/internal/ext/extension/providerext/providerext.go similarity index 97% rename from internal/extension/providerext/providerext.go rename to internal/ext/extension/providerext/providerext.go index 1dd055d1af..15673c6ab1 100644 --- a/internal/extension/providerext/providerext.go +++ b/internal/ext/extension/providerext/providerext.go @@ -5,7 +5,7 @@ // base resolver's catalog with every sidecar's declared catalog and routes // plugin-namespaced refs (plugin///) to the owning // sidecar's Provider. It mirrors the Remote broker's host-side semantics -// (internal/remote/broker) exactly: 1-based contiguous seq buffering, a +// (internal/platform/remote/broker) exactly: 1-based contiguous seq buffering, a // bounded delivery queue, a gap timer on stream end, cancellation through // stream/cancel, and interruption via StreamInterruptedError. A selected // sidecar's crash fails its streams — the adapter never falls back to a @@ -20,11 +20,11 @@ import ( "sync" "time" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/providerconv" - "reasonix/internal/extension/sidecar" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/providerconv" + "reasonix/internal/ext/extension/sidecar" ) // ProviderClient is the slice of a live sidecar connection the adapter needs. diff --git a/internal/extension/providerext/providerext_test.go b/internal/ext/extension/providerext/providerext_test.go similarity index 99% rename from internal/extension/providerext/providerext_test.go rename to internal/ext/extension/providerext/providerext_test.go index 7488f09c96..5b0b3ba785 100644 --- a/internal/extension/providerext/providerext_test.go +++ b/internal/ext/extension/providerext/providerext_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" ) // fakeClient implements ProviderClient with programmable behavior; streams are diff --git a/internal/extension/providerext/stream.go b/internal/ext/extension/providerext/stream.go similarity index 98% rename from internal/extension/providerext/stream.go rename to internal/ext/extension/providerext/stream.go index 0aaa1ca318..82fa0e9e83 100644 --- a/internal/extension/providerext/stream.go +++ b/internal/ext/extension/providerext/stream.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/providerconv" - "reasonix/internal/provider" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/providerconv" ) // extensionStream is one in-flight sidecar provider stream. Its fields are diff --git a/internal/extension/providerext/stream_lifecycle_test.go b/internal/ext/extension/providerext/stream_lifecycle_test.go similarity index 96% rename from internal/extension/providerext/stream_lifecycle_test.go rename to internal/ext/extension/providerext/stream_lifecycle_test.go index 8a7c95f6c2..f43f27b628 100644 --- a/internal/extension/providerext/stream_lifecycle_test.go +++ b/internal/ext/extension/providerext/stream_lifecycle_test.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "testing" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/protocol" ) func TestFinishedStreamUnregistersDrainCancel(t *testing.T) { diff --git a/internal/extension/providerext/stream_test.go b/internal/ext/extension/providerext/stream_test.go similarity index 99% rename from internal/extension/providerext/stream_test.go rename to internal/ext/extension/providerext/stream_test.go index f862c47c4e..d95d57cb5a 100644 --- a/internal/extension/providerext/stream_test.go +++ b/internal/ext/extension/providerext/stream_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/protocol" ) // openTestStream resolves the demo ref and opens a stream, returning the diff --git a/internal/extension/proxy.go b/internal/ext/extension/proxy.go similarity index 100% rename from internal/extension/proxy.go rename to internal/ext/extension/proxy.go diff --git a/internal/extension/proxy_test.go b/internal/ext/extension/proxy_test.go similarity index 100% rename from internal/extension/proxy_test.go rename to internal/ext/extension/proxy_test.go diff --git a/internal/extension/publish.go b/internal/ext/extension/publish.go similarity index 100% rename from internal/extension/publish.go rename to internal/ext/extension/publish.go diff --git a/internal/extension/publish_test.go b/internal/ext/extension/publish_test.go similarity index 100% rename from internal/extension/publish_test.go rename to internal/ext/extension/publish_test.go diff --git a/internal/extension/receipt_store.go b/internal/ext/extension/receipt_store.go similarity index 100% rename from internal/extension/receipt_store.go rename to internal/ext/extension/receipt_store.go diff --git a/internal/extension/receipt_store_test.go b/internal/ext/extension/receipt_store_test.go similarity index 100% rename from internal/extension/receipt_store_test.go rename to internal/ext/extension/receipt_store_test.go diff --git a/internal/extension/recovery_policy.go b/internal/ext/extension/recovery_policy.go similarity index 100% rename from internal/extension/recovery_policy.go rename to internal/ext/extension/recovery_policy.go diff --git a/internal/extension/recovery_policy_test.go b/internal/ext/extension/recovery_policy_test.go similarity index 100% rename from internal/extension/recovery_policy_test.go rename to internal/ext/extension/recovery_policy_test.go diff --git a/internal/extension/replace.go b/internal/ext/extension/replace.go similarity index 99% rename from internal/extension/replace.go rename to internal/ext/extension/replace.go index e5fc8763d2..769b89ecbd 100644 --- a/internal/extension/replace.go +++ b/internal/ext/extension/replace.go @@ -1,7 +1,7 @@ package extension import ( - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extensioncontract" "fmt" "maps" diff --git a/internal/extension/replace_test.go b/internal/ext/extension/replace_test.go similarity index 100% rename from internal/extension/replace_test.go rename to internal/ext/extension/replace_test.go diff --git a/internal/extension/rpcwire/bootstrap.go b/internal/ext/extension/rpcwire/bootstrap.go similarity index 100% rename from internal/extension/rpcwire/bootstrap.go rename to internal/ext/extension/rpcwire/bootstrap.go diff --git a/internal/extension/rpcwire/bootstrap_test.go b/internal/ext/extension/rpcwire/bootstrap_test.go similarity index 100% rename from internal/extension/rpcwire/bootstrap_test.go rename to internal/ext/extension/rpcwire/bootstrap_test.go diff --git a/internal/extension/rpcwire/conn.go b/internal/ext/extension/rpcwire/conn.go similarity index 100% rename from internal/extension/rpcwire/conn.go rename to internal/ext/extension/rpcwire/conn.go diff --git a/internal/extension/rpcwire/conn_strict_regression_test.go b/internal/ext/extension/rpcwire/conn_strict_regression_test.go similarity index 100% rename from internal/extension/rpcwire/conn_strict_regression_test.go rename to internal/ext/extension/rpcwire/conn_strict_regression_test.go diff --git a/internal/extension/rpcwire/conn_test.go b/internal/ext/extension/rpcwire/conn_test.go similarity index 100% rename from internal/extension/rpcwire/conn_test.go rename to internal/ext/extension/rpcwire/conn_test.go diff --git a/internal/extension/rpcwire/errors.go b/internal/ext/extension/rpcwire/errors.go similarity index 100% rename from internal/extension/rpcwire/errors.go rename to internal/ext/extension/rpcwire/errors.go diff --git a/internal/extension/rpcwire/framing.go b/internal/ext/extension/rpcwire/framing.go similarity index 100% rename from internal/extension/rpcwire/framing.go rename to internal/ext/extension/rpcwire/framing.go diff --git a/internal/extension/rpcwire/stall_test.go b/internal/ext/extension/rpcwire/stall_test.go similarity index 100% rename from internal/extension/rpcwire/stall_test.go rename to internal/ext/extension/rpcwire/stall_test.go diff --git a/internal/extension/runtime_owner.go b/internal/ext/extension/runtime_owner.go similarity index 100% rename from internal/extension/runtime_owner.go rename to internal/ext/extension/runtime_owner.go diff --git a/internal/extension/runtime_owner_test.go b/internal/ext/extension/runtime_owner_test.go similarity index 99% rename from internal/extension/runtime_owner_test.go rename to internal/ext/extension/runtime_owner_test.go index 39833a1e4c..73db7103f1 100644 --- a/internal/extension/runtime_owner_test.go +++ b/internal/ext/extension/runtime_owner_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestRuntimeOwnerFallbackIsObservable(t *testing.T) { diff --git a/internal/extension/runtimeplan.go b/internal/ext/extension/runtimeplan.go similarity index 99% rename from internal/extension/runtimeplan.go rename to internal/ext/extension/runtimeplan.go index 28b809c7aa..0ce9c2b992 100644 --- a/internal/extension/runtimeplan.go +++ b/internal/ext/extension/runtimeplan.go @@ -1,7 +1,7 @@ package extension import ( - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extensioncontract" "maps" "slices" diff --git a/internal/extension/runtimeplan_classify_test.go b/internal/ext/extension/runtimeplan_classify_test.go similarity index 98% rename from internal/extension/runtimeplan_classify_test.go rename to internal/ext/extension/runtimeplan_classify_test.go index 04f312b873..4b5e700a36 100644 --- a/internal/extension/runtimeplan_classify_test.go +++ b/internal/ext/extension/runtimeplan_classify_test.go @@ -3,7 +3,7 @@ package extension import ( "testing" - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extensioncontract" ) func TestClassifySubgraphNone(t *testing.T) { diff --git a/internal/extension/runtimeplan_test.go b/internal/ext/extension/runtimeplan_test.go similarity index 99% rename from internal/extension/runtimeplan_test.go rename to internal/ext/extension/runtimeplan_test.go index 524b1b7e7b..bf43a1ff7e 100644 --- a/internal/extension/runtimeplan_test.go +++ b/internal/ext/extension/runtimeplan_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extensioncontract" ) func TestRuntimePlanNoOp(t *testing.T) { diff --git a/internal/extension/runtimeset.go b/internal/ext/extension/runtimeset.go similarity index 100% rename from internal/extension/runtimeset.go rename to internal/ext/extension/runtimeset.go diff --git a/internal/extension/runtimeset_test.go b/internal/ext/extension/runtimeset_test.go similarity index 100% rename from internal/extension/runtimeset_test.go rename to internal/ext/extension/runtimeset_test.go diff --git a/internal/extension/scope_resources.go b/internal/ext/extension/scope_resources.go similarity index 100% rename from internal/extension/scope_resources.go rename to internal/ext/extension/scope_resources.go diff --git a/internal/extension/scope_resources_test.go b/internal/ext/extension/scope_resources_test.go similarity index 100% rename from internal/extension/scope_resources_test.go rename to internal/ext/extension/scope_resources_test.go diff --git a/internal/extension/sessionstate.go b/internal/ext/extension/sessionstate.go similarity index 99% rename from internal/extension/sessionstate.go rename to internal/ext/extension/sessionstate.go index 6ac4281e42..0420183457 100644 --- a/internal/extension/sessionstate.go +++ b/internal/ext/extension/sessionstate.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // SessionExtensionsVersion is the on-disk version of the sidecar state file. diff --git a/internal/extension/sessionstate_test.go b/internal/ext/extension/sessionstate_test.go similarity index 99% rename from internal/extension/sessionstate_test.go rename to internal/ext/extension/sessionstate_test.go index e5792d536c..758ae4e679 100644 --- a/internal/extension/sessionstate_test.go +++ b/internal/ext/extension/sessionstate_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestSessionExtensionsRoundTrip(t *testing.T) { diff --git a/internal/extension/sidecar/benchmark_test.go b/internal/ext/extension/sidecar/benchmark_test.go similarity index 97% rename from internal/extension/sidecar/benchmark_test.go rename to internal/ext/extension/sidecar/benchmark_test.go index 8f8128ea5b..d52991052a 100644 --- a/internal/extension/sidecar/benchmark_test.go +++ b/internal/ext/extension/sidecar/benchmark_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/pluginpkg" ) // BenchmarkExtensionSidecarStartup measures a real no-op sidecar process diff --git a/internal/extension/sidecar/client.go b/internal/ext/extension/sidecar/client.go similarity index 99% rename from internal/extension/sidecar/client.go rename to internal/ext/extension/sidecar/client.go index 35e2aa6d71..b602486661 100644 --- a/internal/extension/sidecar/client.go +++ b/internal/ext/extension/sidecar/client.go @@ -12,11 +12,11 @@ import ( "sync/atomic" "time" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/rpcwire" - "reasonix/internal/pluginpkg" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/rpcwire" + "reasonix/internal/ext/pluginpkg" ) // Lifecycle budgets. @@ -74,7 +74,7 @@ func (unavailableUIHandler) Request(context.Context, protocol.UIRequestParams) ( } // StreamRouter receives the extension's provider stream notifications. -// internal/extension/providerext installs the real router through +// internal/ext/extension/providerext installs the real router through // SetStreamRouter; the nil default drops with a debug log. type StreamRouter interface { RouteStreamChunk(p protocol.StreamChunkParams) diff --git a/internal/extension/sidecar/client_test.go b/internal/ext/extension/sidecar/client_test.go similarity index 99% rename from internal/extension/sidecar/client_test.go rename to internal/ext/extension/sidecar/client_test.go index 39456319c6..1142aff045 100644 --- a/internal/extension/sidecar/client_test.go +++ b/internal/ext/extension/sidecar/client_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/rpcwire" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/rpcwire" + "reasonix/internal/ext/pluginpkg" ) func TestHandshakeSuccess(t *testing.T) { diff --git a/internal/extension/sidecar/content.go b/internal/ext/extension/sidecar/content.go similarity index 99% rename from internal/extension/sidecar/content.go rename to internal/ext/extension/sidecar/content.go index 7efc595b81..74fea07263 100644 --- a/internal/extension/sidecar/content.go +++ b/internal/ext/extension/sidecar/content.go @@ -11,7 +11,7 @@ import ( "fmt" "sync" - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension/protocol" ) // storeMaxEntries bounds the per-client content store; the oldest object is diff --git a/internal/extension/sidecar/content_test.go b/internal/ext/extension/sidecar/content_test.go similarity index 99% rename from internal/extension/sidecar/content_test.go rename to internal/ext/extension/sidecar/content_test.go index 1128f7ad16..06f20ddd65 100644 --- a/internal/extension/sidecar/content_test.go +++ b/internal/ext/extension/sidecar/content_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension/protocol" ) // readAll pages a content ref through ReadHandler the way an extension would diff --git a/internal/extension/sidecar/doc.go b/internal/ext/extension/sidecar/doc.go similarity index 100% rename from internal/extension/sidecar/doc.go rename to internal/ext/extension/sidecar/doc.go diff --git a/internal/extension/sidecar/externalize.go b/internal/ext/extension/sidecar/externalize.go similarity index 99% rename from internal/extension/sidecar/externalize.go rename to internal/ext/extension/sidecar/externalize.go index 1b7d9be0b1..8f81c25c4c 100644 --- a/internal/extension/sidecar/externalize.go +++ b/internal/ext/extension/sidecar/externalize.go @@ -8,7 +8,7 @@ import ( "fmt" "reflect" - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension/protocol" ) // Content-ref externalization for the intercept and event calls. The wire diff --git a/internal/extension/sidecar/externalize_test.go b/internal/ext/extension/sidecar/externalize_test.go similarity index 99% rename from internal/extension/sidecar/externalize_test.go rename to internal/ext/extension/sidecar/externalize_test.go index 7d751b81db..da700e57a3 100644 --- a/internal/extension/sidecar/externalize_test.go +++ b/internal/ext/extension/sidecar/externalize_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/pluginpkg" ) // bigInputPayload builds an input.receive payload whose text is size bytes. diff --git a/internal/extension/sidecar/fake_test.go b/internal/ext/extension/sidecar/fake_test.go similarity index 98% rename from internal/extension/sidecar/fake_test.go rename to internal/ext/extension/sidecar/fake_test.go index c79dfe9e35..8d90d501cb 100644 --- a/internal/extension/sidecar/fake_test.go +++ b/internal/ext/extension/sidecar/fake_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/rpcwire" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/rpcwire" + "reasonix/internal/ext/pluginpkg" ) // Re-exec fake sidecar (the standard Go helper-process pattern): the test diff --git a/internal/extension/sidecar/manager.go b/internal/ext/extension/sidecar/manager.go similarity index 98% rename from internal/extension/sidecar/manager.go rename to internal/ext/extension/sidecar/manager.go index 690d379ce7..fe28d05ec8 100644 --- a/internal/extension/sidecar/manager.go +++ b/internal/ext/extension/sidecar/manager.go @@ -8,10 +8,10 @@ import ( "strings" "sync" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/pluginpkg" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/pluginpkg" ) const ( diff --git a/internal/extension/sidecar/manager_test.go b/internal/ext/extension/sidecar/manager_test.go similarity index 98% rename from internal/extension/sidecar/manager_test.go rename to internal/ext/extension/sidecar/manager_test.go index 67c45df1db..92ef8f091b 100644 --- a/internal/extension/sidecar/manager_test.go +++ b/internal/ext/extension/sidecar/manager_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/pluginpkg" ) func startPackagesForTest(ctx context.Context, home string, sessionCtx protocol.SessionContext, ui UIHandler) (*Manager, []string, error) { diff --git a/internal/extension/sidecar/nth_fail_test.go b/internal/ext/extension/sidecar/nth_fail_test.go similarity index 93% rename from internal/extension/sidecar/nth_fail_test.go rename to internal/ext/extension/sidecar/nth_fail_test.go index 8ba5bdd36c..ec03b16629 100644 --- a/internal/extension/sidecar/nth_fail_test.go +++ b/internal/ext/extension/sidecar/nth_fail_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) // TestNthRequiredFailureClosesEarlierSuccesses: Nth required fail → nil manager. diff --git a/internal/extension/sidecar/plan.go b/internal/ext/extension/sidecar/plan.go similarity index 98% rename from internal/extension/sidecar/plan.go rename to internal/ext/extension/sidecar/plan.go index 7ddf3b6984..44ec866de6 100644 --- a/internal/extension/sidecar/plan.go +++ b/internal/ext/extension/sidecar/plan.go @@ -6,10 +6,10 @@ import ( "log/slog" "strings" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/pluginpkg" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/pluginpkg" ) // PluginComponentID returns the dependency-graph component ID for an installed diff --git a/internal/extension/sidecar/plan_test.go b/internal/ext/extension/sidecar/plan_test.go similarity index 98% rename from internal/extension/sidecar/plan_test.go rename to internal/ext/extension/sidecar/plan_test.go index 4bd1940bdb..0f53a46a5c 100644 --- a/internal/extension/sidecar/plan_test.go +++ b/internal/ext/extension/sidecar/plan_test.go @@ -3,7 +3,7 @@ package sidecar import ( "testing" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) func TestPluginComponentIDRoundTrip(t *testing.T) { diff --git a/internal/extension/sidecar/probe_client.go b/internal/ext/extension/sidecar/probe_client.go similarity index 95% rename from internal/extension/sidecar/probe_client.go rename to internal/ext/extension/sidecar/probe_client.go index 327da2930f..534def52be 100644 --- a/internal/extension/sidecar/probe_client.go +++ b/internal/ext/extension/sidecar/probe_client.go @@ -1,7 +1,7 @@ package sidecar import ( - "reasonix/internal/extension/protocol" + "reasonix/internal/ext/extension/protocol" ) // NewProbeClient is a host-test seam: non-process Client with declared diff --git a/internal/extension/sidecar/process.go b/internal/ext/extension/sidecar/process.go similarity index 96% rename from internal/extension/sidecar/process.go rename to internal/ext/extension/sidecar/process.go index 8f1cd9eec0..0882eea59e 100644 --- a/internal/extension/sidecar/process.go +++ b/internal/ext/extension/sidecar/process.go @@ -11,19 +11,19 @@ import ( "sync" "time" - "reasonix/internal/pluginpkg" - "reasonix/internal/proc" - "reasonix/internal/secrets" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" + "reasonix/internal/ext/pluginpkg" ) -// Bounded-close budgets, mirrored from internal/plugin's stdio transport: a +// Bounded-close budgets, mirrored from internal/ext/plugin's stdio transport: a // short stdin-EOF grace for protocol-aware sidecars, then a hard tree kill // with a bounded reap so one wedged sidecar can never stall teardown. const ( gracefulCloseWaitBudget = 750 * time.Millisecond closeWaitBudget = 5 * time.Second // stderrTailBytes bounds the ring of sidecar stderr retained for - // diagnostics, mirrored from internal/plugin's tailBuffer. + // diagnostics, mirrored from internal/ext/plugin's tailBuffer. stderrTailBytes = 16 << 10 ) @@ -47,7 +47,7 @@ var shellExecutables = map[string]bool{ // startupFailure carries bounded diagnostics for a sidecar that failed to // start or hand shake: the stage, elapsed time, and the redacted stderr tail. -// The shape mirrors internal/plugin's startupFailure. +// The shape mirrors internal/ext/plugin's startupFailure. type startupFailure struct { Stage string Elapsed time.Duration diff --git a/internal/extension/sidecar/process_test.go b/internal/ext/extension/sidecar/process_test.go similarity index 98% rename from internal/extension/sidecar/process_test.go rename to internal/ext/extension/sidecar/process_test.go index e1be2226a7..186694be4b 100644 --- a/internal/extension/sidecar/process_test.go +++ b/internal/ext/extension/sidecar/process_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) func TestResolveRuntimeCommandContract(t *testing.T) { diff --git a/internal/extension/sidecar/provides.go b/internal/ext/extension/sidecar/provides.go similarity index 97% rename from internal/extension/sidecar/provides.go rename to internal/ext/extension/sidecar/provides.go index 6a02ebf224..5d28cc8401 100644 --- a/internal/extension/sidecar/provides.go +++ b/internal/ext/extension/sidecar/provides.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/extension/protocol" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/pluginpkg" ) func (c *Client) initializeParams() protocol.InitializeParams { diff --git a/internal/extension/sidecar/stream_router_test.go b/internal/ext/extension/sidecar/stream_router_test.go similarity index 98% rename from internal/extension/sidecar/stream_router_test.go rename to internal/ext/extension/sidecar/stream_router_test.go index 62f5875040..94613bea14 100644 --- a/internal/extension/sidecar/stream_router_test.go +++ b/internal/ext/extension/sidecar/stream_router_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/pluginpkg" ) // recordingRouter captures routed provider stream notifications. diff --git a/internal/extension/sidecar/tools.go b/internal/ext/extension/sidecar/tools.go similarity index 96% rename from internal/extension/sidecar/tools.go rename to internal/ext/extension/sidecar/tools.go index 87fd71e0b9..7a588f3380 100644 --- a/internal/extension/sidecar/tools.go +++ b/internal/ext/extension/sidecar/tools.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/pluginpkg" ) // validateTools holds the tools a runtime activated at initialize to the ones diff --git a/internal/extension/sidecar/tools_test.go b/internal/ext/extension/sidecar/tools_test.go similarity index 97% rename from internal/extension/sidecar/tools_test.go rename to internal/ext/extension/sidecar/tools_test.go index 44477dd5f9..60233ef7cd 100644 --- a/internal/extension/sidecar/tools_test.go +++ b/internal/ext/extension/sidecar/tools_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "reasonix/internal/extension/protocol" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/pluginpkg" ) func withTools(served string, capability bool) func(rt *pluginpkg.RuntimeSpec) { diff --git a/internal/extension/snapshot.go b/internal/ext/extension/snapshot.go similarity index 97% rename from internal/extension/snapshot.go rename to internal/ext/extension/snapshot.go index 9cf22a7b18..6a74edfe95 100644 --- a/internal/extension/snapshot.go +++ b/internal/ext/extension/snapshot.go @@ -7,7 +7,7 @@ import ( "maps" "sort" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // RuntimeSnapshot is the frozen, effective runtime configuration produced by @@ -163,7 +163,7 @@ func (s *RuntimeSnapshot) CacheShape() (systemHash, toolsHash string) { // normalizeToolSchemas sorts schemas by (name, description, parameters) so a // reordered input cannot change the hash. This mirrors the canonicalization -// in internal/agent/cache_shape.go; it is reimplemented here rather than +// in internal/runtime/agent/cache_shape.go; it is reimplemented here rather than // imported because the kernel must stay below the agent package in the // dependency graph. func normalizeToolSchemas(schemas []provider.ToolSchema) []provider.ToolSchema { @@ -197,7 +197,7 @@ func sha256Hex(b []byte) string { // computeCacheShape hashes the system prompt and the canonical tool schemas. // Keeping the two halves separate costs nothing and lets CacheShape explain -// prefix-cache misses the way internal/agent.CompareShape does. +// prefix-cache misses the way internal/runtime/agent.CompareShape does. func computeCacheShape(systemPrompt string, schemas []provider.ToolSchema) (systemHash, toolsHash, cacheHash string) { canonical := normalizeToolSchemas(schemas) toolsJSON, _ := json.Marshal(canonical) diff --git a/internal/extension/snapshot_live_test.go b/internal/ext/extension/snapshot_live_test.go similarity index 97% rename from internal/extension/snapshot_live_test.go rename to internal/ext/extension/snapshot_live_test.go index 1d6c098199..2305f9ecb4 100644 --- a/internal/extension/snapshot_live_test.go +++ b/internal/ext/extension/snapshot_live_test.go @@ -3,7 +3,7 @@ package extension import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestWithLiveContributionsPreservesCacheHash(t *testing.T) { diff --git a/internal/extension/snapshot_test.go b/internal/ext/extension/snapshot_test.go similarity index 99% rename from internal/extension/snapshot_test.go rename to internal/ext/extension/snapshot_test.go index fc67f60df7..75e8973ee8 100644 --- a/internal/extension/snapshot_test.go +++ b/internal/ext/extension/snapshot_test.go @@ -8,7 +8,7 @@ import ( "sort" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // hashTestSnapshot builds a snapshot with two tools, an interceptor, and a diff --git a/internal/extension/source.go b/internal/ext/extension/source.go similarity index 100% rename from internal/extension/source.go rename to internal/ext/extension/source.go diff --git a/internal/extension/stale.go b/internal/ext/extension/stale.go similarity index 100% rename from internal/extension/stale.go rename to internal/ext/extension/stale.go diff --git a/internal/extension/testdata/spatiotemporal-v2/lifecycle.states.golden.json b/internal/ext/extension/testdata/spatiotemporal-v2/lifecycle.states.golden.json similarity index 100% rename from internal/extension/testdata/spatiotemporal-v2/lifecycle.states.golden.json rename to internal/ext/extension/testdata/spatiotemporal-v2/lifecycle.states.golden.json diff --git a/internal/extension/testdata/spatiotemporal-v2/manifest.v2.golden.json b/internal/ext/extension/testdata/spatiotemporal-v2/manifest.v2.golden.json similarity index 100% rename from internal/extension/testdata/spatiotemporal-v2/manifest.v2.golden.json rename to internal/ext/extension/testdata/spatiotemporal-v2/manifest.v2.golden.json diff --git a/internal/extension/uihub/hub.go b/internal/ext/extension/uihub/hub.go similarity index 99% rename from internal/extension/uihub/hub.go rename to internal/ext/extension/uihub/hub.go index cc2c5bd216..ec981604e2 100644 --- a/internal/extension/uihub/hub.go +++ b/internal/ext/extension/uihub/hub.go @@ -23,11 +23,11 @@ import ( "strings" "sync" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/sidecar" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/sidecar" ) // UIHandler is the sidecar package's Extension → Host UI call surface, diff --git a/internal/extension/uihub/hub_test.go b/internal/ext/extension/uihub/hub_test.go similarity index 99% rename from internal/extension/uihub/hub_test.go rename to internal/ext/extension/uihub/hub_test.go index 96c7b918e8..7dd67912ef 100644 --- a/internal/extension/uihub/hub_test.go +++ b/internal/ext/extension/uihub/hub_test.go @@ -8,8 +8,8 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/extension/protocol" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension/protocol" ) const testCredential = "api_key=sk-abcdef1234567890SECRETKEY" diff --git a/internal/extension/uihub/view_test.go b/internal/ext/extension/uihub/view_test.go similarity index 97% rename from internal/extension/uihub/view_test.go rename to internal/ext/extension/uihub/view_test.go index 29668fb6ea..985284e82f 100644 --- a/internal/extension/uihub/view_test.go +++ b/internal/ext/extension/uihub/view_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/extension/protocol" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension/protocol" ) // A view arrives as a tree, and every string in it is shown to the user — so diff --git a/internal/extensioncontract/capability.go b/internal/ext/extensioncontract/capability.go similarity index 100% rename from internal/extensioncontract/capability.go rename to internal/ext/extensioncontract/capability.go diff --git a/internal/extensioncontract/capability_test.go b/internal/ext/extensioncontract/capability_test.go similarity index 100% rename from internal/extensioncontract/capability_test.go rename to internal/ext/extensioncontract/capability_test.go diff --git a/internal/extensioncontract/providerref.go b/internal/ext/extensioncontract/providerref.go similarity index 100% rename from internal/extensioncontract/providerref.go rename to internal/ext/extensioncontract/providerref.go diff --git a/internal/extensioncontract/providerref_test.go b/internal/ext/extensioncontract/providerref_test.go similarity index 100% rename from internal/extensioncontract/providerref_test.go rename to internal/ext/extensioncontract/providerref_test.go diff --git a/internal/hook/batch_command_other.go b/internal/ext/hook/batch_command_other.go similarity index 100% rename from internal/hook/batch_command_other.go rename to internal/ext/hook/batch_command_other.go diff --git a/internal/hook/batch_command_windows.go b/internal/ext/hook/batch_command_windows.go similarity index 100% rename from internal/hook/batch_command_windows.go rename to internal/ext/hook/batch_command_windows.go diff --git a/internal/hook/command_normalize.go b/internal/ext/hook/command_normalize.go similarity index 99% rename from internal/hook/command_normalize.go rename to internal/ext/hook/command_normalize.go index a54fe2142c..5784a2f181 100644 --- a/internal/hook/command_normalize.go +++ b/internal/ext/hook/command_normalize.go @@ -3,7 +3,7 @@ package hook import ( "strings" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // NormalizeCommand repairs narrow classes of copied JSON-escaped hook commands. diff --git a/internal/hook/edit.go b/internal/ext/hook/edit.go similarity index 98% rename from internal/hook/edit.go rename to internal/ext/hook/edit.go index a02017c9d1..87f789317c 100644 --- a/internal/hook/edit.go +++ b/internal/ext/hook/edit.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // SettingsPath returns the file a scope's hooks are written to. A project scope diff --git a/internal/hook/edit_test.go b/internal/ext/hook/edit_test.go similarity index 99% rename from internal/hook/edit_test.go rename to internal/ext/hook/edit_test.go index d15742a100..48a0b7de8e 100644 --- a/internal/hook/edit_test.go +++ b/internal/ext/hook/edit_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // settings.json is shared with unrelated configuration. A hooks editor that diff --git a/internal/hook/env_contract.go b/internal/ext/hook/env_contract.go similarity index 98% rename from internal/hook/env_contract.go rename to internal/ext/hook/env_contract.go index 832bf15613..b8abea5e65 100644 --- a/internal/hook/env_contract.go +++ b/internal/ext/hook/env_contract.go @@ -11,7 +11,7 @@ import ( "mvdan.cc/sh/v3/syntax" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // reasonixEnvPrefix is the namespace Reasonix defines. A reference inside it diff --git a/internal/hook/execution_contract_test.go b/internal/ext/hook/execution_contract_test.go similarity index 99% rename from internal/hook/execution_contract_test.go rename to internal/ext/hook/execution_contract_test.go index 08f0964301..594a5bdb92 100644 --- a/internal/hook/execution_contract_test.go +++ b/internal/ext/hook/execution_contract_test.go @@ -15,7 +15,7 @@ import ( "unicode/utf16" "unicode/utf8" - "reasonix/internal/sandbox" + "reasonix/internal/safety/sandbox" ) func TestHookExecHelperProcess(t *testing.T) { diff --git a/internal/hook/hook.go b/internal/ext/hook/hook.go similarity index 99% rename from internal/hook/hook.go rename to internal/ext/hook/hook.go index 714afa3ac1..bab54845cb 100644 --- a/internal/hook/hook.go +++ b/internal/ext/hook/hook.go @@ -7,8 +7,8 @@ // code is its verdict: 0 = pass, 2 = block (only on the gating events), other = // warn. The payload is delivered as JSON on stdin; output is captured (capped) // and surfaced to the user. This package only loads, matches, and runs hooks; -// the agent and controller decide what a block means (see internal/agent, -// internal/control). +// the agent and controller decide what a block means (see internal/runtime/agent, +// internal/session/control). package hook import ( @@ -29,12 +29,12 @@ import ( "time" "unicode/utf16" - "reasonix/internal/config" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/pluginpkg" - "reasonix/internal/proc" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/config" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/safety/sandbox" ) // Event is a point in the agent loop a hook can fire at. @@ -490,7 +490,7 @@ func MatchesTool(h ResolvedHook, toolName string) bool { // so corresponds to Claude's single "Agent" tool: the general task delegator // (task/read_only_task/parallel_tasks) and the dedicated named wrappers // around a runAs=subagent skill (BuiltinSubagentTools in -// internal/skill/tools.go — each is a distinct, directly-callable tool, not +// internal/ext/skill/tools.go — each is a distinct, directly-callable tool, not // routed through run_skill). A Claude "Agent" safety matcher must see all of // them, or a hook scoped to it silently misses whichever entry point wasn't // mapped. @@ -622,7 +622,7 @@ var claudeToolInputKeyRenames = map[string]map[string]string{ // schema demands an absolute path ("must be absolute, not relative" on // Read/Write/Edit/NotebookEdit). Reasonix's file tools accept relative paths // and resolve them against the workspace root (resolveIn in -// internal/tool/builtin/workspace.go); the payload resolves against +// internal/tools/builtin/workspace.go); the payload resolves against // payload.Cwd — the same root — so a prefix-matching guard inspects the path // the tool actually accesses, not a relative spelling it never compares. var claudeAbsolutePathInputKeys = []string{"file_path", "notebook_path"} diff --git a/internal/hook/hook_test.go b/internal/ext/hook/hook_test.go similarity index 99% rename from internal/hook/hook_test.go rename to internal/ext/hook/hook_test.go index bff0620726..2b3a697118 100644 --- a/internal/hook/hook_test.go +++ b/internal/ext/hook/hook_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/pluginpkg" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/safety/sandbox" ) func writeSettings(t *testing.T, dir, json string) { diff --git a/internal/hook/inspect.go b/internal/ext/hook/inspect.go similarity index 98% rename from internal/hook/inspect.go rename to internal/ext/hook/inspect.go index d758971305..1871def483 100644 --- a/internal/hook/inspect.go +++ b/internal/ext/hook/inspect.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/pluginpkg" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/ext/pluginpkg" ) // SourceStatus describes one hooks settings file for diagnostics. diff --git a/internal/hook/notice_repeat_test.go b/internal/ext/hook/notice_repeat_test.go similarity index 98% rename from internal/hook/notice_repeat_test.go rename to internal/ext/hook/notice_repeat_test.go index 4b163ba9fe..c5d8d4c06d 100644 --- a/internal/hook/notice_repeat_test.go +++ b/internal/ext/hook/notice_repeat_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // A PreToolUse hook runs before every tool call, so a hook that is broken on diff --git a/internal/hook/posix_syntax.go b/internal/ext/hook/posix_syntax.go similarity index 97% rename from internal/hook/posix_syntax.go rename to internal/ext/hook/posix_syntax.go index 785b223f1c..4cb4cae229 100644 --- a/internal/hook/posix_syntax.go +++ b/internal/ext/hook/posix_syntax.go @@ -6,7 +6,7 @@ import ( "mvdan.cc/sh/v3/syntax" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // windowsPOSIXShellCommand runs a settings hook written in shell syntax through diff --git a/internal/hook/posix_syntax_test.go b/internal/ext/hook/posix_syntax_test.go similarity index 100% rename from internal/hook/posix_syntax_test.go rename to internal/ext/hook/posix_syntax_test.go diff --git a/internal/hook/runner.go b/internal/ext/hook/runner.go similarity index 100% rename from internal/hook/runner.go rename to internal/ext/hook/runner.go diff --git a/internal/hook/runner_test.go b/internal/ext/hook/runner_test.go similarity index 99% rename from internal/hook/runner_test.go rename to internal/ext/hook/runner_test.go index 1890f6d505..ec92131538 100644 --- a/internal/hook/runner_test.go +++ b/internal/ext/hook/runner_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // Runner construction diff --git a/internal/hook/windows_batch_test.go b/internal/ext/hook/windows_batch_test.go similarity index 98% rename from internal/hook/windows_batch_test.go rename to internal/ext/hook/windows_batch_test.go index b344f61741..7917c107c0 100644 --- a/internal/hook/windows_batch_test.go +++ b/internal/ext/hook/windows_batch_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/pluginpkg" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/safety/sandbox" ) func TestDefaultSpawnerRunsQuotedPluginBatchHook(t *testing.T) { diff --git a/internal/hook/windows_compat.go b/internal/ext/hook/windows_compat.go similarity index 99% rename from internal/hook/windows_compat.go rename to internal/ext/hook/windows_compat.go index 40e36cdfec..e3d0963a38 100644 --- a/internal/hook/windows_compat.go +++ b/internal/ext/hook/windows_compat.go @@ -11,8 +11,8 @@ import ( "sync" "unicode/utf8" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/sandbox" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/safety/sandbox" ) var windowsHookBash struct { diff --git a/internal/hook/windows_posix_script.go b/internal/ext/hook/windows_posix_script.go similarity index 99% rename from internal/hook/windows_posix_script.go rename to internal/ext/hook/windows_posix_script.go index e392415897..edebfced41 100644 --- a/internal/hook/windows_posix_script.go +++ b/internal/ext/hook/windows_posix_script.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/pluginpkg" ) func completePluginHookExecutionConfig(h pluginpkg.Hook, root, goos string, mode ExecutionMode) HookConfig { diff --git a/internal/hook/windows_posix_script_test.go b/internal/ext/hook/windows_posix_script_test.go similarity index 98% rename from internal/hook/windows_posix_script_test.go rename to internal/ext/hook/windows_posix_script_test.go index ba4ebf07ff..3e6b7a06ef 100644 --- a/internal/hook/windows_posix_script_test.go +++ b/internal/ext/hook/windows_posix_script_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) func TestWindowsExtensionlessPOSIXPluginHookUsesBash(t *testing.T) { diff --git a/internal/installsource/apply.go b/internal/ext/installsource/apply.go similarity index 99% rename from internal/installsource/apply.go rename to internal/ext/installsource/apply.go index 8d1c816ad6..be6b7687e7 100644 --- a/internal/installsource/apply.go +++ b/internal/ext/installsource/apply.go @@ -10,8 +10,8 @@ import ( "slices" "strings" - "reasonix/internal/config" - "reasonix/internal/skill" + "reasonix/internal/contract/config" + "reasonix/internal/ext/skill" ) // apply dispatches to the per-action implementation. Each branch is diff --git a/internal/installsource/archive.go b/internal/ext/installsource/archive.go similarity index 100% rename from internal/installsource/archive.go rename to internal/ext/installsource/archive.go diff --git a/internal/installsource/archive_test.go b/internal/ext/installsource/archive_test.go similarity index 97% rename from internal/installsource/archive_test.go rename to internal/ext/installsource/archive_test.go index b5d122c52d..72c2da96b8 100644 --- a/internal/installsource/archive_test.go +++ b/internal/ext/installsource/archive_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) // The round trip is the point: what an export produces is what an install diff --git a/internal/installsource/doc.go b/internal/ext/installsource/doc.go similarity index 100% rename from internal/installsource/doc.go rename to internal/ext/installsource/doc.go diff --git a/internal/installsource/errors.go b/internal/ext/installsource/errors.go similarity index 100% rename from internal/installsource/errors.go rename to internal/ext/installsource/errors.go diff --git a/internal/installsource/http.go b/internal/ext/installsource/http.go similarity index 100% rename from internal/installsource/http.go rename to internal/ext/installsource/http.go diff --git a/internal/installsource/install_source.go b/internal/ext/installsource/install_source.go similarity index 99% rename from internal/installsource/install_source.go rename to internal/ext/installsource/install_source.go index 4e15c4ca78..fdf151fbbb 100644 --- a/internal/installsource/install_source.go +++ b/internal/ext/installsource/install_source.go @@ -18,10 +18,10 @@ import ( "sort" "strings" - "reasonix/internal/config" - "reasonix/internal/pluginpkg" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/ext/skill" ) // MCPConnectResult is what the ConnectMCP callback returns. Disconnect is diff --git a/internal/installsource/install_source_test.go b/internal/ext/installsource/install_source_test.go similarity index 99% rename from internal/installsource/install_source_test.go rename to internal/ext/installsource/install_source_test.go index 35683e9dc6..0aa8904114 100644 --- a/internal/installsource/install_source_test.go +++ b/internal/ext/installsource/install_source_test.go @@ -15,11 +15,11 @@ import ( "sync/atomic" "testing" - "reasonix/internal/config" - "reasonix/internal/pluginpkg" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/ext/skill" ) func TestMain(m *testing.M) { diff --git a/internal/installsource/mcp.go b/internal/ext/installsource/mcp.go similarity index 99% rename from internal/installsource/mcp.go rename to internal/ext/installsource/mcp.go index 7130c0453c..a674506530 100644 --- a/internal/installsource/mcp.go +++ b/internal/ext/installsource/mcp.go @@ -7,8 +7,8 @@ import ( "slices" "strings" - "reasonix/internal/config" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/config" ) // mcpEntryAction assembles the DTO for a single MCP server install. The diff --git a/internal/installsource/names.go b/internal/ext/installsource/names.go similarity index 99% rename from internal/installsource/names.go rename to internal/ext/installsource/names.go index a4e21d1a7a..e10d1fde78 100644 --- a/internal/installsource/names.go +++ b/internal/ext/installsource/names.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // packageNameRe matches valid npm package-name segments. Pinned by [a-z0-9._-] diff --git a/internal/installsource/plan.go b/internal/ext/installsource/plan.go similarity index 99% rename from internal/installsource/plan.go rename to internal/ext/installsource/plan.go index 0b82930c6b..2533621ab9 100644 --- a/internal/installsource/plan.go +++ b/internal/ext/installsource/plan.go @@ -13,7 +13,7 @@ import ( "strings" "unicode" - "reasonix/internal/skill" + "reasonix/internal/ext/skill" ) var githubAPIBaseURL = "https://api.github.com" diff --git a/internal/installsource/plan_ticket_test.go b/internal/ext/installsource/plan_ticket_test.go similarity index 98% rename from internal/installsource/plan_ticket_test.go rename to internal/ext/installsource/plan_ticket_test.go index 31baa06cac..c46d95f509 100644 --- a/internal/installsource/plan_ticket_test.go +++ b/internal/ext/installsource/plan_ticket_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/permission" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/safety/permission" ) // writeHookedPlugin lays out a package whose hooks execute during sessions, diff --git a/internal/installsource/plugin_package.go b/internal/ext/installsource/plugin_package.go similarity index 99% rename from internal/installsource/plugin_package.go rename to internal/ext/installsource/plugin_package.go index be0ab880df..6a0fdc3a43 100644 --- a/internal/installsource/plugin_package.go +++ b/internal/ext/installsource/plugin_package.go @@ -13,8 +13,8 @@ import ( "sort" "strings" - "reasonix/internal/gitcmd" - "reasonix/internal/pluginpkg" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/platform/gitcmd" ) const ( diff --git a/internal/installsource/plugin_package_windows_test.go b/internal/ext/installsource/plugin_package_windows_test.go similarity index 100% rename from internal/installsource/plugin_package_windows_test.go rename to internal/ext/installsource/plugin_package_windows_test.go diff --git a/internal/installsource/plugin_runtime_test.go b/internal/ext/installsource/plugin_runtime_test.go similarity index 99% rename from internal/installsource/plugin_runtime_test.go rename to internal/ext/installsource/plugin_runtime_test.go index 24ca7f8a9a..d56f4b26f7 100644 --- a/internal/installsource/plugin_runtime_test.go +++ b/internal/ext/installsource/plugin_runtime_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // writeRuntimePlugin writes a Manifest v2 plugin package with a runtime diff --git a/internal/installsource/skill.go b/internal/ext/installsource/skill.go similarity index 98% rename from internal/installsource/skill.go rename to internal/ext/installsource/skill.go index d8cc30e243..c8d8f459ba 100644 --- a/internal/installsource/skill.go +++ b/internal/ext/installsource/skill.go @@ -10,10 +10,10 @@ import ( "sort" "strings" - "reasonix/internal/config" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/frontmatter" - "reasonix/internal/skill" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/frontmatter" + "reasonix/internal/contract/config" + "reasonix/internal/ext/skill" ) const ( diff --git a/internal/installsource/ssrf.go b/internal/ext/installsource/ssrf.go similarity index 97% rename from internal/installsource/ssrf.go rename to internal/ext/installsource/ssrf.go index 165db94d7e..385bf64466 100644 --- a/internal/installsource/ssrf.go +++ b/internal/ext/installsource/ssrf.go @@ -15,7 +15,7 @@ import ( // runs at dial time on the resolved IP and then dials that vetted IP, so a // public host that DNS-rebinds to an internal address is caught too. // -// This mirrors web_fetch's guard (internal/tool/builtin/webfetch.go); the +// This mirrors web_fetch's guard (internal/tools/builtin/webfetch.go); the // install_source tool fetches the same kind of untrusted URLs and must not be // the one un-guarded path. Kept in sync by hand — both block the same set. func ssrfGuardClient(base *http.Client) *http.Client { diff --git a/internal/installsource/tarball.go b/internal/ext/installsource/tarball.go similarity index 100% rename from internal/installsource/tarball.go rename to internal/ext/installsource/tarball.go diff --git a/internal/installsource/tarball_test.go b/internal/ext/installsource/tarball_test.go similarity index 99% rename from internal/installsource/tarball_test.go rename to internal/ext/installsource/tarball_test.go index b705916db8..bbf7bf3f2c 100644 --- a/internal/installsource/tarball_test.go +++ b/internal/ext/installsource/tarball_test.go @@ -14,7 +14,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) type tarEntry struct { diff --git a/internal/installsource/types.go b/internal/ext/installsource/types.go similarity index 99% rename from internal/installsource/types.go rename to internal/ext/installsource/types.go index 2e36e9121d..79d704776b 100644 --- a/internal/installsource/types.go +++ b/internal/ext/installsource/types.go @@ -3,8 +3,8 @@ package installsource import ( "encoding/json" - "reasonix/internal/config" - "reasonix/internal/pluginpkg" + "reasonix/internal/contract/config" + "reasonix/internal/ext/pluginpkg" ) // request mirrors the public schema. Fields stay exported because Execute diff --git a/internal/mcpdiag/auth.go b/internal/ext/mcpdiag/auth.go similarity index 100% rename from internal/mcpdiag/auth.go rename to internal/ext/mcpdiag/auth.go diff --git a/internal/mcpdiag/auth_test.go b/internal/ext/mcpdiag/auth_test.go similarity index 100% rename from internal/mcpdiag/auth_test.go rename to internal/ext/mcpdiag/auth_test.go diff --git a/internal/mcplaunch/launch.go b/internal/ext/mcplaunch/launch.go similarity index 99% rename from internal/mcplaunch/launch.go rename to internal/ext/mcplaunch/launch.go index bdcd896a41..eb32d32c9f 100644 --- a/internal/mcplaunch/launch.go +++ b/internal/ext/mcplaunch/launch.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) const ( diff --git a/internal/mcplaunch/launch_test.go b/internal/ext/mcplaunch/launch_test.go similarity index 99% rename from internal/mcplaunch/launch_test.go rename to internal/ext/mcplaunch/launch_test.go index 31cfa18069..1c485e2973 100644 --- a/internal/mcplaunch/launch_test.go +++ b/internal/ext/mcplaunch/launch_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestProjectLaunchIdentityDigestCanonicalizesStableIdentity(t *testing.T) { diff --git a/internal/mcplaunch/process_other.go b/internal/ext/mcplaunch/process_other.go similarity index 100% rename from internal/mcplaunch/process_other.go rename to internal/ext/mcplaunch/process_other.go diff --git a/internal/mcplaunch/process_unix.go b/internal/ext/mcplaunch/process_unix.go similarity index 100% rename from internal/mcplaunch/process_unix.go rename to internal/ext/mcplaunch/process_unix.go diff --git a/internal/mcplaunch/process_windows.go b/internal/ext/mcplaunch/process_windows.go similarity index 100% rename from internal/mcplaunch/process_windows.go rename to internal/ext/mcplaunch/process_windows.go diff --git a/internal/mcplaunch/process_windows_test.go b/internal/ext/mcplaunch/process_windows_test.go similarity index 100% rename from internal/mcplaunch/process_windows_test.go rename to internal/ext/mcplaunch/process_windows_test.go diff --git a/internal/mcpregistry/registry.go b/internal/ext/mcpregistry/registry.go similarity index 99% rename from internal/mcpregistry/registry.go rename to internal/ext/mcpregistry/registry.go index 251cabbd53..8753222129 100644 --- a/internal/mcpregistry/registry.go +++ b/internal/ext/mcpregistry/registry.go @@ -17,8 +17,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" ) const DefaultBaseURL = "https://registry.modelcontextprotocol.io" diff --git a/internal/mcpregistry/registry_test.go b/internal/ext/mcpregistry/registry_test.go similarity index 99% rename from internal/mcpregistry/registry_test.go rename to internal/ext/mcpregistry/registry_test.go index 556b35e0cc..5b90b1dd45 100644 --- a/internal/mcpregistry/registry_test.go +++ b/internal/ext/mcpregistry/registry_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestSearchNormalizesOfficialRegistryEntries(t *testing.T) { diff --git a/internal/mcpsetup/argv.go b/internal/ext/mcpsetup/argv.go similarity index 99% rename from internal/mcpsetup/argv.go rename to internal/ext/mcpsetup/argv.go index a10d511f9c..f2986bd217 100644 --- a/internal/mcpsetup/argv.go +++ b/internal/ext/mcpsetup/argv.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // ParseArgs reads the argv forms `mcp add` accepts: diff --git a/internal/mcpsetup/doc.go b/internal/ext/mcpsetup/doc.go similarity index 100% rename from internal/mcpsetup/doc.go rename to internal/ext/mcpsetup/doc.go diff --git a/internal/mcpsetup/parse.go b/internal/ext/mcpsetup/parse.go similarity index 99% rename from internal/mcpsetup/parse.go rename to internal/ext/mcpsetup/parse.go index bc0254ec55..18506ddacc 100644 --- a/internal/mcpsetup/parse.go +++ b/internal/ext/mcpsetup/parse.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // Draft is a parsed proposal: what would be installed, and what the user should diff --git a/internal/mcpsetup/parse_test.go b/internal/ext/mcpsetup/parse_test.go similarity index 100% rename from internal/mcpsetup/parse_test.go rename to internal/ext/mcpsetup/parse_test.go diff --git a/internal/mcpsetup/secrets.go b/internal/ext/mcpsetup/secrets.go similarity index 100% rename from internal/mcpsetup/secrets.go rename to internal/ext/mcpsetup/secrets.go diff --git a/internal/plugin/aux_lifecycle_test.go b/internal/ext/plugin/aux_lifecycle_test.go similarity index 100% rename from internal/plugin/aux_lifecycle_test.go rename to internal/ext/plugin/aux_lifecycle_test.go diff --git a/internal/plugin/cache.go b/internal/ext/plugin/cache.go similarity index 98% rename from internal/plugin/cache.go rename to internal/ext/plugin/cache.go index 8082a76c7e..86fe4be4bb 100644 --- a/internal/plugin/cache.go +++ b/internal/ext/plugin/cache.go @@ -21,10 +21,10 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/tool" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" ) // cacheableToolsOf extracts the persistable subset of remote tools so Start() diff --git a/internal/plugin/cache_test.go b/internal/ext/plugin/cache_test.go similarity index 99% rename from internal/plugin/cache_test.go rename to internal/ext/plugin/cache_test.go index fce78f3fb0..0e84162f1d 100644 --- a/internal/plugin/cache_test.go +++ b/internal/ext/plugin/cache_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "reasonix/internal/mcplaunch" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/mcplaunch" + "reasonix/internal/safety/sandbox" ) // redirectCache points config.CacheDir() at a fresh temp dir for the duration diff --git a/internal/plugin/cancellation.go b/internal/ext/plugin/cancellation.go similarity index 100% rename from internal/plugin/cancellation.go rename to internal/ext/plugin/cancellation.go diff --git a/internal/plugin/canonicalize.go b/internal/ext/plugin/canonicalize.go similarity index 90% rename from internal/plugin/canonicalize.go rename to internal/ext/plugin/canonicalize.go index 66bab08997..b990e1ef00 100644 --- a/internal/plugin/canonicalize.go +++ b/internal/ext/plugin/canonicalize.go @@ -4,8 +4,8 @@ import ( "encoding/json" "sort" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // sortToolsByName returns a new slice of tools sorted alphabetically by Name(). diff --git a/internal/plugin/canonicalize_test.go b/internal/ext/plugin/canonicalize_test.go similarity index 99% rename from internal/plugin/canonicalize_test.go rename to internal/ext/plugin/canonicalize_test.go index 9c8e7a0cad..4c5897ff95 100644 --- a/internal/plugin/canonicalize_test.go +++ b/internal/ext/plugin/canonicalize_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func TestCanonicalizeSchemaStable(t *testing.T) { diff --git a/internal/plugin/chrome_devtools_live_test.go b/internal/ext/plugin/chrome_devtools_live_test.go similarity index 97% rename from internal/plugin/chrome_devtools_live_test.go rename to internal/ext/plugin/chrome_devtools_live_test.go index 2da654b3fb..7f80a1978b 100644 --- a/internal/plugin/chrome_devtools_live_test.go +++ b/internal/ext/plugin/chrome_devtools_live_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/secrets" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/secrets" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) // TestChromeDevtoolsMCPLive is an opt-in release smoke test for the real npm @@ -21,7 +21,7 @@ import ( // // Run with: // -// REASONIX_LIVE_CHROME_MCP=1 go test ./internal/plugin \ +// REASONIX_LIVE_CHROME_MCP=1 go test ./internal/ext/plugin \ // -run '^TestChromeDevtoolsMCPLive$' -v -count=1 -timeout=3m func TestChromeDevtoolsMCPLive(t *testing.T) { if os.Getenv("REASONIX_LIVE_CHROME_MCP") != "1" { diff --git a/internal/plugin/client_close.go b/internal/ext/plugin/client_close.go similarity index 100% rename from internal/plugin/client_close.go rename to internal/ext/plugin/client_close.go diff --git a/internal/plugin/client_session.go b/internal/ext/plugin/client_session.go similarity index 99% rename from internal/plugin/client_session.go rename to internal/ext/plugin/client_session.go index 5d472a36b1..a35a4fa3a8 100644 --- a/internal/plugin/client_session.go +++ b/internal/ext/plugin/client_session.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func (c *Client) call(ctx context.Context, method string, params any) (json.RawMessage, error) { diff --git a/internal/plugin/codegraph_limit.go b/internal/ext/plugin/codegraph_limit.go similarity index 100% rename from internal/plugin/codegraph_limit.go rename to internal/ext/plugin/codegraph_limit.go diff --git a/internal/plugin/codegraph_limit_test.go b/internal/ext/plugin/codegraph_limit_test.go similarity index 100% rename from internal/plugin/codegraph_limit_test.go rename to internal/ext/plugin/codegraph_limit_test.go diff --git a/internal/plugin/deferred_spawn.go b/internal/ext/plugin/deferred_spawn.go similarity index 100% rename from internal/plugin/deferred_spawn.go rename to internal/ext/plugin/deferred_spawn.go diff --git a/internal/plugin/example_test.go b/internal/ext/plugin/example_test.go similarity index 97% rename from internal/plugin/example_test.go rename to internal/ext/plugin/example_test.go index bc1738ce8e..c79e0d5e45 100644 --- a/internal/plugin/example_test.go +++ b/internal/ext/plugin/example_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) // buildExamplePlugin compiles cmd/reasonix-plugin-example into a temp binary and diff --git a/internal/plugin/failures.go b/internal/ext/plugin/failures.go similarity index 100% rename from internal/plugin/failures.go rename to internal/ext/plugin/failures.go diff --git a/internal/plugin/failures_status_test.go b/internal/ext/plugin/failures_status_test.go similarity index 100% rename from internal/plugin/failures_status_test.go rename to internal/ext/plugin/failures_status_test.go diff --git a/internal/plugin/host_concurrency_test.go b/internal/ext/plugin/host_concurrency_test.go similarity index 100% rename from internal/plugin/host_concurrency_test.go rename to internal/ext/plugin/host_concurrency_test.go diff --git a/internal/plugin/host_queries.go b/internal/ext/plugin/host_queries.go similarity index 100% rename from internal/plugin/host_queries.go rename to internal/ext/plugin/host_queries.go diff --git a/internal/plugin/hotadd_test.go b/internal/ext/plugin/hotadd_test.go similarity index 100% rename from internal/plugin/hotadd_test.go rename to internal/ext/plugin/hotadd_test.go diff --git a/internal/plugin/install.go b/internal/ext/plugin/install.go similarity index 100% rename from internal/plugin/install.go rename to internal/ext/plugin/install.go diff --git a/internal/plugin/instructions_test.go b/internal/ext/plugin/instructions_test.go similarity index 100% rename from internal/plugin/instructions_test.go rename to internal/ext/plugin/instructions_test.go diff --git a/internal/plugin/known_overrides.go b/internal/ext/plugin/known_overrides.go similarity index 100% rename from internal/plugin/known_overrides.go rename to internal/ext/plugin/known_overrides.go diff --git a/internal/plugin/launcher_lock.go b/internal/ext/plugin/launcher_lock.go similarity index 99% rename from internal/plugin/launcher_lock.go rename to internal/ext/plugin/launcher_lock.go index e7f50edf60..03a68239b1 100644 --- a/internal/plugin/launcher_lock.go +++ b/internal/ext/plugin/launcher_lock.go @@ -15,8 +15,8 @@ import ( "slices" "strings" - "reasonix/internal/mcplaunch" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/ext/mcplaunch" ) type launcherLocator struct { diff --git a/internal/plugin/launcher_lock_test.go b/internal/ext/plugin/launcher_lock_test.go similarity index 99% rename from internal/plugin/launcher_lock_test.go rename to internal/ext/plugin/launcher_lock_test.go index d62b725ee5..1972bb7884 100644 --- a/internal/plugin/launcher_lock_test.go +++ b/internal/ext/plugin/launcher_lock_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "reasonix/internal/mcplaunch" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/mcplaunch" ) func TestStoredNPXLauncherLockUsesExactOfflinePackage(t *testing.T) { diff --git a/internal/plugin/lazy.go b/internal/ext/plugin/lazy.go similarity index 99% rename from internal/plugin/lazy.go rename to internal/ext/plugin/lazy.go index 8d147359f2..335854acf7 100644 --- a/internal/plugin/lazy.go +++ b/internal/ext/plugin/lazy.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // DefaultStartupBudget is the per-plugin latency budget used by boot when diff --git a/internal/plugin/lazy_test.go b/internal/ext/plugin/lazy_test.go similarity index 99% rename from internal/plugin/lazy_test.go rename to internal/ext/plugin/lazy_test.go index aef22eb2fb..583c99a0c9 100644 --- a/internal/plugin/lazy_test.go +++ b/internal/ext/plugin/lazy_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "reasonix/internal/mcplaunch" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/mcplaunch" ) type destructiveLazyTarget struct { diff --git a/internal/plugin/main_test.go b/internal/ext/plugin/main_test.go similarity index 94% rename from internal/plugin/main_test.go rename to internal/ext/plugin/main_test.go index 9cf7ed0320..bb8939cf10 100644 --- a/internal/plugin/main_test.go +++ b/internal/ext/plugin/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" "go.uber.org/goleak" ) diff --git a/internal/plugin/oauth.go b/internal/ext/plugin/oauth.go similarity index 99% rename from internal/plugin/oauth.go rename to internal/ext/plugin/oauth.go index 9b76c707dd..2a40c6917d 100644 --- a/internal/plugin/oauth.go +++ b/internal/ext/plugin/oauth.go @@ -18,8 +18,8 @@ import ( "strings" "time" - "reasonix/internal/mcpdiag" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/ext/mcpdiag" ) const ( diff --git a/internal/plugin/oauth_helpers.go b/internal/ext/plugin/oauth_helpers.go similarity index 100% rename from internal/plugin/oauth_helpers.go rename to internal/ext/plugin/oauth_helpers.go diff --git a/internal/plugin/oauth_refresh.go b/internal/ext/plugin/oauth_refresh.go similarity index 100% rename from internal/plugin/oauth_refresh.go rename to internal/ext/plugin/oauth_refresh.go diff --git a/internal/plugin/oauth_refresh_semantics_test.go b/internal/ext/plugin/oauth_refresh_semantics_test.go similarity index 99% rename from internal/plugin/oauth_refresh_semantics_test.go rename to internal/ext/plugin/oauth_refresh_semantics_test.go index 67b43591ec..e1095838c7 100644 --- a/internal/plugin/oauth_refresh_semantics_test.go +++ b/internal/ext/plugin/oauth_refresh_semantics_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // What forceRefresh has to mean. The question is not "is this token stale by my diff --git a/internal/plugin/oauth_state.go b/internal/ext/plugin/oauth_state.go similarity index 98% rename from internal/plugin/oauth_state.go rename to internal/ext/plugin/oauth_state.go index f1268bf9e4..4f3797b298 100644 --- a/internal/plugin/oauth_state.go +++ b/internal/ext/plugin/oauth_state.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "reasonix/internal/filelock" - "reasonix/internal/fileutil" + "reasonix/internal/base/filelock" + "reasonix/internal/base/fileutil" ) // oauthRefreshGates prevent duplicate refresh requests from transports in the diff --git a/internal/plugin/oauth_test.go b/internal/ext/plugin/oauth_test.go similarity index 99% rename from internal/plugin/oauth_test.go rename to internal/ext/plugin/oauth_test.go index d1fdc6c207..f0df2a0957 100644 --- a/internal/plugin/oauth_test.go +++ b/internal/ext/plugin/oauth_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestParseBearerChallenge(t *testing.T) { diff --git a/internal/plugin/plugin.go b/internal/ext/plugin/plugin.go similarity index 99% rename from internal/plugin/plugin.go rename to internal/ext/plugin/plugin.go index a257641721..c7b6a6c537 100644 --- a/internal/plugin/plugin.go +++ b/internal/ext/plugin/plugin.go @@ -23,12 +23,12 @@ import ( "sync/atomic" "time" - "reasonix/internal/event" - "reasonix/internal/mcplaunch" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/tool" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/mcplaunch" + "reasonix/internal/safety/sandbox" ) // protocolVersion is the MCP revision Reasonix advertises during initialize. diff --git a/internal/plugin/plugin_test.go b/internal/ext/plugin/plugin_test.go similarity index 99% rename from internal/plugin/plugin_test.go rename to internal/ext/plugin/plugin_test.go index e4fc4d679e..c2975906a0 100644 --- a/internal/plugin/plugin_test.go +++ b/internal/ext/plugin/plugin_test.go @@ -16,11 +16,11 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/mcplaunch" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/mcplaunch" + "reasonix/internal/safety/sandbox" ) type countingToolsTransport struct { diff --git a/internal/plugin/process_mode_test.go b/internal/ext/plugin/process_mode_test.go similarity index 98% rename from internal/plugin/process_mode_test.go rename to internal/ext/plugin/process_mode_test.go index 040141626b..7dc67e3b63 100644 --- a/internal/plugin/process_mode_test.go +++ b/internal/ext/plugin/process_mode_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) func TestResolvedProcessModeDefaultsToHost(t *testing.T) { diff --git a/internal/plugin/prompts.go b/internal/ext/plugin/prompts.go similarity index 100% rename from internal/plugin/prompts.go rename to internal/ext/plugin/prompts.go diff --git a/internal/plugin/protocol_inbound.go b/internal/ext/plugin/protocol_inbound.go similarity index 99% rename from internal/plugin/protocol_inbound.go rename to internal/ext/plugin/protocol_inbound.go index 02445b75ba..fdda3d7b51 100644 --- a/internal/plugin/protocol_inbound.go +++ b/internal/ext/plugin/protocol_inbound.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // progressTransport is optional so lightweight transports used by embedders and diff --git a/internal/plugin/proxy.go b/internal/ext/plugin/proxy.go similarity index 100% rename from internal/plugin/proxy.go rename to internal/ext/plugin/proxy.go diff --git a/internal/plugin/proxy_e2e_test.go b/internal/ext/plugin/proxy_e2e_test.go similarity index 97% rename from internal/plugin/proxy_e2e_test.go rename to internal/ext/plugin/proxy_e2e_test.go index 0e0ed8e574..93c05277bf 100644 --- a/internal/plugin/proxy_e2e_test.go +++ b/internal/ext/plugin/proxy_e2e_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/capability" - "reasonix/internal/plugin" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/capability" ) // mockSpec mirrors helperSpec (lazy_test.go): the test binary re-runs itself diff --git a/internal/plugin/proxy_test.go b/internal/ext/plugin/proxy_test.go similarity index 100% rename from internal/plugin/proxy_test.go rename to internal/ext/plugin/proxy_test.go diff --git a/internal/plugin/registration_journal_test.go b/internal/ext/plugin/registration_journal_test.go similarity index 100% rename from internal/plugin/registration_journal_test.go rename to internal/ext/plugin/registration_journal_test.go diff --git a/internal/plugin/registration_scope.go b/internal/ext/plugin/registration_scope.go similarity index 100% rename from internal/plugin/registration_scope.go rename to internal/ext/plugin/registration_scope.go diff --git a/internal/plugin/resources.go b/internal/ext/plugin/resources.go similarity index 100% rename from internal/plugin/resources.go rename to internal/ext/plugin/resources.go diff --git a/internal/plugin/security.go b/internal/ext/plugin/security.go similarity index 98% rename from internal/plugin/security.go rename to internal/ext/plugin/security.go index f5443a6ea4..4484b658f0 100644 --- a/internal/plugin/security.go +++ b/internal/ext/plugin/security.go @@ -9,9 +9,9 @@ import ( "slices" "strings" - "reasonix/internal/mcplaunch" - "reasonix/internal/secrets" - "reasonix/internal/tool" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/mcplaunch" ) // projectLaunchIdentityDigest resolves a secret-free identity before a project diff --git a/internal/plugin/startup.go b/internal/ext/plugin/startup.go similarity index 98% rename from internal/plugin/startup.go rename to internal/ext/plugin/startup.go index 7d10806779..3e9533f423 100644 --- a/internal/plugin/startup.go +++ b/internal/ext/plugin/startup.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" ) // defaultStartupTimeout bounds the real initialize + tools/list handshake. diff --git a/internal/plugin/startup_cause_test.go b/internal/ext/plugin/startup_cause_test.go similarity index 100% rename from internal/plugin/startup_cause_test.go rename to internal/ext/plugin/startup_cause_test.go diff --git a/internal/plugin/stats.go b/internal/ext/plugin/stats.go similarity index 99% rename from internal/plugin/stats.go rename to internal/ext/plugin/stats.go index a0e17de2f3..0c462d9374 100644 --- a/internal/plugin/stats.go +++ b/internal/ext/plugin/stats.go @@ -19,8 +19,8 @@ import ( "slices" "time" - "reasonix/internal/config" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/config" ) const ( diff --git a/internal/plugin/stats_test.go b/internal/ext/plugin/stats_test.go similarity index 99% rename from internal/plugin/stats_test.go rename to internal/ext/plugin/stats_test.go index aae3ceec82..fc3e941946 100644 --- a/internal/plugin/stats_test.go +++ b/internal/ext/plugin/stats_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // withTempCache redirects config.CacheDir() at t.TempDir for the duration of a diff --git a/internal/plugin/status.go b/internal/ext/plugin/status.go similarity index 96% rename from internal/plugin/status.go rename to internal/ext/plugin/status.go index fcb86b7da3..cee97972a0 100644 --- a/internal/plugin/status.go +++ b/internal/ext/plugin/status.go @@ -6,7 +6,7 @@ package plugin import ( "fmt" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // SetStatusSink installs where connection-state changes are announced. The Host diff --git a/internal/plugin/status_sink_test.go b/internal/ext/plugin/status_sink_test.go similarity index 97% rename from internal/plugin/status_sink_test.go rename to internal/ext/plugin/status_sink_test.go index bc1bc27363..c6fd5a473b 100644 --- a/internal/plugin/status_sink_test.go +++ b/internal/ext/plugin/status_sink_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) type capturedSink struct { diff --git a/internal/plugin/stdio_cancel_test.go b/internal/ext/plugin/stdio_cancel_test.go similarity index 99% rename from internal/plugin/stdio_cancel_test.go rename to internal/ext/plugin/stdio_cancel_test.go index c25b371094..5b6a048c8d 100644 --- a/internal/plugin/stdio_cancel_test.go +++ b/internal/ext/plugin/stdio_cancel_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) type discardWriteCloser struct{} diff --git a/internal/plugin/toolresult_image.go b/internal/ext/plugin/toolresult_image.go similarity index 98% rename from internal/plugin/toolresult_image.go rename to internal/ext/plugin/toolresult_image.go index 9d147abf2e..bd82421dc4 100644 --- a/internal/plugin/toolresult_image.go +++ b/internal/ext/plugin/toolresult_image.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/visionimage" + "reasonix/internal/model/visionimage" ) // Tool-result images ride to vision models as base64 data URLs, so each item is diff --git a/internal/plugin/toolresult_image_test.go b/internal/ext/plugin/toolresult_image_test.go similarity index 100% rename from internal/plugin/toolresult_image_test.go rename to internal/ext/plugin/toolresult_image_test.go diff --git a/internal/plugin/transport_concurrency_test.go b/internal/ext/plugin/transport_concurrency_test.go similarity index 100% rename from internal/plugin/transport_concurrency_test.go rename to internal/ext/plugin/transport_concurrency_test.go diff --git a/internal/plugin/transport_http.go b/internal/ext/plugin/transport_http.go similarity index 99% rename from internal/plugin/transport_http.go rename to internal/ext/plugin/transport_http.go index 0c08bbd86a..a459bfe5ae 100644 --- a/internal/plugin/transport_http.go +++ b/internal/ext/plugin/transport_http.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "reasonix/internal/mcpdiag" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/mcpdiag" ) // maxHTTPBody caps how much of a JSON / SSE response body we read, so a diff --git a/internal/plugin/transport_http_status_test.go b/internal/ext/plugin/transport_http_status_test.go similarity index 100% rename from internal/plugin/transport_http_status_test.go rename to internal/ext/plugin/transport_http_status_test.go diff --git a/internal/plugin/transport_http_test.go b/internal/ext/plugin/transport_http_test.go similarity index 99% rename from internal/plugin/transport_http_test.go rename to internal/ext/plugin/transport_http_test.go index 177f4e0b53..67f7f44c0d 100644 --- a/internal/plugin/transport_http_test.go +++ b/internal/ext/plugin/transport_http_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) // mcpHTTPServer is a minimal Streamable HTTP MCP server for tests. When sse is diff --git a/internal/plugin/transport_reconnect.go b/internal/ext/plugin/transport_reconnect.go similarity index 99% rename from internal/plugin/transport_reconnect.go rename to internal/ext/plugin/transport_reconnect.go index 03a713c577..c988bb0a1a 100644 --- a/internal/plugin/transport_reconnect.go +++ b/internal/ext/plugin/transport_reconnect.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // errTransportGone marks a connection that ended before the request was diff --git a/internal/plugin/transport_sse.go b/internal/ext/plugin/transport_sse.go similarity index 99% rename from internal/plugin/transport_sse.go rename to internal/ext/plugin/transport_sse.go index bab65eff5b..22d6554db2 100644 --- a/internal/plugin/transport_sse.go +++ b/internal/ext/plugin/transport_sse.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // sseTransport implements MCP's legacy HTTP+SSE transport. The client keeps a diff --git a/internal/plugin/transport_sse_test.go b/internal/ext/plugin/transport_sse_test.go similarity index 99% rename from internal/plugin/transport_sse_test.go rename to internal/ext/plugin/transport_sse_test.go index 3578f0bcf1..b063af3dec 100644 --- a/internal/plugin/transport_sse_test.go +++ b/internal/ext/plugin/transport_sse_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) func TestLegacySSETransportSupportsRootsToolsAndProgress(t *testing.T) { diff --git a/internal/plugin/transport_stdio.go b/internal/ext/plugin/transport_stdio.go similarity index 99% rename from internal/plugin/transport_stdio.go rename to internal/ext/plugin/transport_stdio.go index 6f90f836e2..e7bac79ce0 100644 --- a/internal/plugin/transport_stdio.go +++ b/internal/ext/plugin/transport_stdio.go @@ -16,10 +16,10 @@ import ( "sync" "time" - "reasonix/internal/proc" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/tool" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" ) const ( diff --git a/internal/plugin/transport_stdio_cache_test.go b/internal/ext/plugin/transport_stdio_cache_test.go similarity index 100% rename from internal/plugin/transport_stdio_cache_test.go rename to internal/ext/plugin/transport_stdio_cache_test.go diff --git a/internal/plugin/transport_stdio_dir_test.go b/internal/ext/plugin/transport_stdio_dir_test.go similarity index 99% rename from internal/plugin/transport_stdio_dir_test.go rename to internal/ext/plugin/transport_stdio_dir_test.go index 80a93cce02..5649be0a4f 100644 --- a/internal/plugin/transport_stdio_dir_test.go +++ b/internal/ext/plugin/transport_stdio_dir_test.go @@ -7,8 +7,8 @@ import ( "runtime" "testing" - "reasonix/internal/mcplaunch" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/mcplaunch" ) // TestNewStdioTransportDirExplicit verifies that explicit Spec.Dir takes diff --git a/internal/plugin/transport_stdio_env_test.go b/internal/ext/plugin/transport_stdio_env_test.go similarity index 95% rename from internal/plugin/transport_stdio_env_test.go rename to internal/ext/plugin/transport_stdio_env_test.go index b7dd3058b0..ef628010dd 100644 --- a/internal/plugin/transport_stdio_env_test.go +++ b/internal/ext/plugin/transport_stdio_env_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/testenv" + "reasonix/internal/base/secrets" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) func TestStdioShellPATHProbeFiltersEnvWhenEnabled(t *testing.T) { diff --git a/internal/plugin/transport_stdio_other_test.go b/internal/ext/plugin/transport_stdio_other_test.go similarity index 100% rename from internal/plugin/transport_stdio_other_test.go rename to internal/ext/plugin/transport_stdio_other_test.go diff --git a/internal/plugin/transport_stdio_recovery_test.go b/internal/ext/plugin/transport_stdio_recovery_test.go similarity index 98% rename from internal/plugin/transport_stdio_recovery_test.go rename to internal/ext/plugin/transport_stdio_recovery_test.go index 481f1e10d7..d40c4a4b66 100644 --- a/internal/plugin/transport_stdio_recovery_test.go +++ b/internal/ext/plugin/transport_stdio_recovery_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) // A stdio child that dies after a healthy handshake must not poison its server diff --git a/internal/plugin/transport_stdio_wait_test.go b/internal/ext/plugin/transport_stdio_wait_test.go similarity index 100% rename from internal/plugin/transport_stdio_wait_test.go rename to internal/ext/plugin/transport_stdio_wait_test.go diff --git a/internal/plugin/transport_stdio_windows_test.go b/internal/ext/plugin/transport_stdio_windows_test.go similarity index 98% rename from internal/plugin/transport_stdio_windows_test.go rename to internal/ext/plugin/transport_stdio_windows_test.go index fbd2ee54c4..c0a8276f90 100644 --- a/internal/plugin/transport_stdio_windows_test.go +++ b/internal/ext/plugin/transport_stdio_windows_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestResolveStdioExecutableWindowsPathAndPATHEXT(t *testing.T) { diff --git a/internal/pluginpkg/claude_compat.go b/internal/ext/pluginpkg/claude_compat.go similarity index 98% rename from internal/pluginpkg/claude_compat.go rename to internal/ext/pluginpkg/claude_compat.go index 140758d7f8..39cd4e7749 100644 --- a/internal/pluginpkg/claude_compat.go +++ b/internal/ext/pluginpkg/claude_compat.go @@ -12,8 +12,8 @@ import ( "sort" "strings" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/frontmatter" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/frontmatter" ) const ( @@ -56,7 +56,7 @@ type claudeHookDocument struct { var claudeStopBlockingEvents = map[string]bool{"Stop": true, "SubagentStop": true} // claudeToolScopedHookEvents are the events whose "matcher" field is -// evaluated against a tool name (see internal/hook's MatchesTool); other +// evaluated against a tool name (see internal/ext/hook's MatchesTool); other // events ignore matcher entirely, so a matcher tool-name compatibility issue // doesn't apply to them. var claudeToolScopedHookEvents = map[string]bool{ @@ -66,7 +66,7 @@ var claudeToolScopedHookEvents = map[string]bool{ // claudeUnsupportedToolMatchers are real Claude Code built-in tool names // (https://code.claude.com/docs/en/tools-reference) that Reasonix never -// passes as a tool_name to a hook (see internal/hook's claudeToolNames / +// passes as a tool_name to a hook (see internal/ext/hook's claudeToolNames / // claudeToolMatchAliases, the actual dispatch-time mapping — keep the two in // sync). A tool-scoped hook whose matcher names only entries from this set // can never fire against a real Reasonix tool call. This is a conservative, @@ -439,7 +439,7 @@ func compatibilityFailure(capability, path string, err error) ([]string, []Compa // call time, not by anything in the manifest, so they can't be flagged here. // PreToolUse/PermissionRequest's "deny" and PermissionRequest's "allow" are // the two runtime decisions Reasonix does implement (see claudeJSONDeny/ -// claudeJSONAllow in internal/hook). Statically detectable gaps +// claudeJSONAllow in internal/ext/hook). Statically detectable gaps // (if/asyncRewake, Stop/ // SubagentStop's inability to block the turn, WebFetch's unavailable required // prompt input, NotebookEdit's untranslatable cell_number, and multi-job diff --git a/internal/pluginpkg/claude_instructions.go b/internal/ext/pluginpkg/claude_instructions.go similarity index 100% rename from internal/pluginpkg/claude_instructions.go rename to internal/ext/pluginpkg/claude_instructions.go diff --git a/internal/pluginpkg/compat_legacy_test.go b/internal/ext/pluginpkg/compat_legacy_test.go similarity index 99% rename from internal/pluginpkg/compat_legacy_test.go rename to internal/ext/pluginpkg/compat_legacy_test.go index 9d9e291128..fa7628a6a9 100644 --- a/internal/pluginpkg/compat_legacy_test.go +++ b/internal/ext/pluginpkg/compat_legacy_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestLegacyNativeManifestRejected pins the v2 one-shot switch: native diff --git a/internal/pluginpkg/describe.go b/internal/ext/pluginpkg/describe.go similarity index 100% rename from internal/pluginpkg/describe.go rename to internal/ext/pluginpkg/describe.go diff --git a/internal/pluginpkg/export.go b/internal/ext/pluginpkg/export.go similarity index 100% rename from internal/pluginpkg/export.go rename to internal/ext/pluginpkg/export.go diff --git a/internal/pluginpkg/export_test.go b/internal/ext/pluginpkg/export_test.go similarity index 99% rename from internal/pluginpkg/export_test.go rename to internal/ext/pluginpkg/export_test.go index 8719aa513f..f6a29f857c 100644 --- a/internal/pluginpkg/export_test.go +++ b/internal/ext/pluginpkg/export_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeExportFile(t *testing.T, path, body string) { diff --git a/internal/pluginpkg/hook_contract_test.go b/internal/ext/pluginpkg/hook_contract_test.go similarity index 99% rename from internal/pluginpkg/hook_contract_test.go rename to internal/ext/pluginpkg/hook_contract_test.go index ea06277ddb..45c707d4e1 100644 --- a/internal/pluginpkg/hook_contract_test.go +++ b/internal/ext/pluginpkg/hook_contract_test.go @@ -8,7 +8,7 @@ import ( "testing" "unicode/utf8" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestHookJSONExecutionFormPresenceMatrix(t *testing.T) { diff --git a/internal/pluginpkg/installed_compat.go b/internal/ext/pluginpkg/installed_compat.go similarity index 100% rename from internal/pluginpkg/installed_compat.go rename to internal/ext/pluginpkg/installed_compat.go diff --git a/internal/pluginpkg/manifest_v1.go b/internal/ext/pluginpkg/manifest_v1.go similarity index 99% rename from internal/pluginpkg/manifest_v1.go rename to internal/ext/pluginpkg/manifest_v1.go index a7cf1b34c7..afeafc51da 100644 --- a/internal/pluginpkg/manifest_v1.go +++ b/internal/ext/pluginpkg/manifest_v1.go @@ -1,7 +1,7 @@ package pluginpkg import ( - "reasonix/internal/extensioncontract" + "reasonix/internal/ext/extensioncontract" "regexp" "bytes" @@ -314,7 +314,7 @@ func mergeV1MCPServers(legacy, contrib map[string]MCPServer) (map[string]MCPServ } // The interceptor points, replacement slots, and priority bounds below -// duplicate internal/extension (intercept.go, replace.go). They are NOT +// duplicate internal/ext/extension (intercept.go, replace.go). They are NOT // imported: extension depends on pluginpkg transitively // (extension -> hook -> pluginpkg), so pluginpkg importing extension would // create an import cycle. Keep these lists in sync with extension — the diff --git a/internal/pluginpkg/manifest_v1_test.go b/internal/ext/pluginpkg/manifest_v1_test.go similarity index 99% rename from internal/pluginpkg/manifest_v1_test.go rename to internal/ext/pluginpkg/manifest_v1_test.go index 16a19bfbf4..ceb073caad 100644 --- a/internal/pluginpkg/manifest_v1_test.go +++ b/internal/ext/pluginpkg/manifest_v1_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // jsonText marshals v for manifest fixture construction in tests. diff --git a/internal/pluginpkg/manifest_v2.go b/internal/ext/pluginpkg/manifest_v2.go similarity index 99% rename from internal/pluginpkg/manifest_v2.go rename to internal/ext/pluginpkg/manifest_v2.go index 1f03445eaf..b2674b9c26 100644 --- a/internal/pluginpkg/manifest_v2.go +++ b/internal/ext/pluginpkg/manifest_v2.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/extensioncontract" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/ext/extensioncontract" ) // ManifestAPIVersionV2 is the only native plugin manifest apiVersion Reasonix diff --git a/internal/pluginpkg/manifest_v2_test.go b/internal/ext/pluginpkg/manifest_v2_test.go similarity index 99% rename from internal/pluginpkg/manifest_v2_test.go rename to internal/ext/pluginpkg/manifest_v2_test.go index 760ff6d94a..5c9fa7795c 100644 --- a/internal/pluginpkg/manifest_v2_test.go +++ b/internal/ext/pluginpkg/manifest_v2_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestManifestV2RequiresProvides(t *testing.T) { diff --git a/internal/pluginpkg/pluginpkg.go b/internal/ext/pluginpkg/pluginpkg.go similarity index 98% rename from internal/pluginpkg/pluginpkg.go rename to internal/ext/pluginpkg/pluginpkg.go index 5228182082..579102330f 100644 --- a/internal/pluginpkg/pluginpkg.go +++ b/internal/ext/pluginpkg/pluginpkg.go @@ -18,10 +18,10 @@ import ( "strings" "sync" - "reasonix/internal/command" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/frontmatter" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/frontmatter" + "reasonix/internal/ext/command" ) const ( @@ -544,7 +544,7 @@ var claudeConventionSkillDirs = []string{"skills", ".claude/skills"} // claudeConventionCommandDirs are the directories a Claude plugin loads slash // commands from by convention. A command is a flat .md prompt template // the user invokes as / — exactly Reasonix's custom-command shape -// (internal/command) — so these directories map onto Manifest.Commands and +// (internal/ext/command) — so these directories map onto Manifest.Commands and // join command discovery at the lowest priority. Unlike skill dirs they are // adopted even when the manifest declares skills explicitly, because // plugin.json never lists commands. @@ -612,7 +612,7 @@ func dirContainsSkill(dir string) bool { } // dirContainsCommandMd reports whether dir holds at least one command -// definition. It delegates to the runtime loader (internal/command), so the +// definition. It delegates to the runtime loader (internal/ext/command), so the // adoption gate and what / actually loads can never diverge — including // arbitrarily nested namespace layouts like commands/a/b/c/commit.md. func dirContainsCommandMd(dir string) bool { @@ -940,7 +940,7 @@ func (p Package) Inventory() Inventory { } // commandRefs loads the package's command dirs through the same loader the -// runtime uses (internal/command), so names, namespacing, and frontmatter +// runtime uses (internal/ext/command), so names, namespacing, and frontmatter // semantics can never drift between the inventory and actual invocation. func (p Package) commandRefs() []CommandRef { roots := p.CommandRoots() @@ -962,7 +962,7 @@ func (p Package) commandRefs() []CommandRef { } // promptRefs loads the package's prompt dirs through the same loader the -// command inventory uses (internal/command): prompt templates share the +// command inventory uses (internal/ext/command): prompt templates share the // slash-command file shape, so names, frontmatter, and malformed-file // handling stay identical. func (p Package) promptRefs() []PromptRef { diff --git a/internal/pluginpkg/pluginpkg_test.go b/internal/ext/pluginpkg/pluginpkg_test.go similarity index 99% rename from internal/pluginpkg/pluginpkg_test.go rename to internal/ext/pluginpkg/pluginpkg_test.go index 8c0c2368d5..b3e0385650 100644 --- a/internal/pluginpkg/pluginpkg_test.go +++ b/internal/ext/pluginpkg/pluginpkg_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func TestParseCodexSuperpowersManifest(t *testing.T) { diff --git a/internal/pluginpkg/state_lock_test.go b/internal/ext/pluginpkg/state_lock_test.go similarity index 99% rename from internal/pluginpkg/state_lock_test.go rename to internal/ext/pluginpkg/state_lock_test.go index ae90f83cf7..efa390f9fb 100644 --- a/internal/pluginpkg/state_lock_test.go +++ b/internal/ext/pluginpkg/state_lock_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestStateConcurrentUpsertAndSetEnabled pins that concurrent load-modify-save diff --git a/internal/pluginspec/pluginspec.go b/internal/ext/pluginspec/pluginspec.go similarity index 98% rename from internal/pluginspec/pluginspec.go rename to internal/ext/pluginspec/pluginspec.go index b23c76ad9d..f128af52a8 100644 --- a/internal/pluginspec/pluginspec.go +++ b/internal/ext/pluginspec/pluginspec.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/mcplaunch" - "reasonix/internal/plugin" - "reasonix/internal/sandbox" + "reasonix/internal/contract/config" + "reasonix/internal/ext/mcplaunch" + "reasonix/internal/ext/plugin" + "reasonix/internal/safety/sandbox" ) // Options carries host runtime policy into plugin specifications. diff --git a/internal/pluginspec/pluginspec_test.go b/internal/ext/pluginspec/pluginspec_test.go similarity index 98% rename from internal/pluginspec/pluginspec_test.go rename to internal/ext/pluginspec/pluginspec_test.go index 8a53286a61..ecebfd40ad 100644 --- a/internal/pluginspec/pluginspec_test.go +++ b/internal/ext/pluginspec/pluginspec_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/plugin" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" ) func TestPluginSpecsMapConfiguredMCPTimeouts(t *testing.T) { diff --git a/internal/skill/authority.go b/internal/ext/skill/authority.go similarity index 100% rename from internal/skill/authority.go rename to internal/ext/skill/authority.go diff --git a/internal/skill/authority_boundary_test.go b/internal/ext/skill/authority_boundary_test.go similarity index 99% rename from internal/skill/authority_boundary_test.go rename to internal/ext/skill/authority_boundary_test.go index e32e445392..8b6c9957d6 100644 --- a/internal/skill/authority_boundary_test.go +++ b/internal/ext/skill/authority_boundary_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // externalProfile is the strongest thing a third party can write in the keys diff --git a/internal/skill/builtin_embed.go b/internal/ext/skill/builtin_embed.go similarity index 96% rename from internal/skill/builtin_embed.go rename to internal/ext/skill/builtin_embed.go index 54df35752b..73555f3003 100644 --- a/internal/skill/builtin_embed.go +++ b/internal/ext/skill/builtin_embed.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "reasonix/internal/skill/builtincontent" + "reasonix/internal/ext/skill/builtincontent" ) var ( diff --git a/internal/skill/builtincontent/embed.go b/internal/ext/skill/builtincontent/embed.go similarity index 98% rename from internal/skill/builtincontent/embed.go rename to internal/ext/skill/builtincontent/embed.go index 17cff35e07..ba1b620712 100644 --- a/internal/skill/builtincontent/embed.go +++ b/internal/ext/skill/builtincontent/embed.go @@ -10,7 +10,7 @@ import ( "path" "strings" - "reasonix/internal/frontmatter" + "reasonix/internal/base/frontmatter" ) //go:embed reasonix-guide/SKILL.md diff --git a/internal/skill/builtincontent/embed_test.go b/internal/ext/skill/builtincontent/embed_test.go similarity index 95% rename from internal/skill/builtincontent/embed_test.go rename to internal/ext/skill/builtincontent/embed_test.go index 925b1dd048..a3da80c1e9 100644 --- a/internal/skill/builtincontent/embed_test.go +++ b/internal/ext/skill/builtincontent/embed_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/skill/builtincontent" + "reasonix/internal/ext/skill/builtincontent" ) func TestLoadReasonixGuide(t *testing.T) { diff --git a/internal/skill/builtincontent/reasonix-guide/SKILL.md b/internal/ext/skill/builtincontent/reasonix-guide/SKILL.md similarity index 100% rename from internal/skill/builtincontent/reasonix-guide/SKILL.md rename to internal/ext/skill/builtincontent/reasonix-guide/SKILL.md diff --git a/internal/skill/builtins.go b/internal/ext/skill/builtins.go similarity index 99% rename from internal/skill/builtins.go rename to internal/ext/skill/builtins.go index 14f3458454..9fae8985c5 100644 --- a/internal/skill/builtins.go +++ b/internal/ext/skill/builtins.go @@ -4,14 +4,14 @@ import ( "slices" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // Built-in skills ship with Reasonix and back the dedicated subagent tools // (explore / research / review / security_review) plus inline playbooks such as // test. A user/project file with the same name overrides the // built-in (see Store.List / Store.Read). Tool names in the bodies match -// internal/tool/builtin. +// internal/tools/builtin. // negativeClaimRule keeps subagents honest about "found nothing" answers. const negativeClaimRule = `When you claim something does NOT exist (no caller, no usage, not implemented), say which searches you ran to reach that conclusion — a negative claim is only as trustworthy as the search behind it.` diff --git a/internal/skill/builtins_test.go b/internal/ext/skill/builtins_test.go similarity index 99% rename from internal/skill/builtins_test.go rename to internal/ext/skill/builtins_test.go index b5ce123654..382db13ea8 100644 --- a/internal/skill/builtins_test.go +++ b/internal/ext/skill/builtins_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) type builtinTestTool struct { diff --git a/internal/skill/delivery.go b/internal/ext/skill/delivery.go similarity index 100% rename from internal/skill/delivery.go rename to internal/ext/skill/delivery.go diff --git a/internal/skill/delivery_frontmatter.go b/internal/ext/skill/delivery_frontmatter.go similarity index 98% rename from internal/skill/delivery_frontmatter.go rename to internal/ext/skill/delivery_frontmatter.go index 9b2bf86a39..6db02f753f 100644 --- a/internal/skill/delivery_frontmatter.go +++ b/internal/ext/skill/delivery_frontmatter.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "reasonix/internal/frontmatter" + "reasonix/internal/base/frontmatter" ) const ( diff --git a/internal/skill/frontmatter_keys.go b/internal/ext/skill/frontmatter_keys.go similarity index 100% rename from internal/skill/frontmatter_keys.go rename to internal/ext/skill/frontmatter_keys.go diff --git a/internal/skill/index.go b/internal/ext/skill/index.go similarity index 99% rename from internal/skill/index.go rename to internal/ext/skill/index.go index bfd57abb27..1441cc03f0 100644 --- a/internal/skill/index.go +++ b/internal/ext/skill/index.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/textutil" + "reasonix/internal/base/textutil" ) // IndexMaxChars caps the skills listing so a large catalog cannot dominate the diff --git a/internal/skill/inspect.go b/internal/ext/skill/inspect.go similarity index 98% rename from internal/skill/inspect.go rename to internal/ext/skill/inspect.go index d659ebc4f9..db7d5e74b2 100644 --- a/internal/skill/inspect.go +++ b/internal/ext/skill/inspect.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // CandidateStatus is the diagnostic disposition of one skill candidate. diff --git a/internal/skill/main_test.go b/internal/ext/skill/main_test.go similarity index 76% rename from internal/skill/main_test.go rename to internal/ext/skill/main_test.go index 2198f28138..da08ac807e 100644 --- a/internal/skill/main_test.go +++ b/internal/ext/skill/main_test.go @@ -3,7 +3,7 @@ package skill import ( "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestMain(m *testing.M) { diff --git a/internal/skill/notfound.go b/internal/ext/skill/notfound.go similarity index 100% rename from internal/skill/notfound.go rename to internal/ext/skill/notfound.go diff --git a/internal/skill/profile.go b/internal/ext/skill/profile.go similarity index 98% rename from internal/skill/profile.go rename to internal/ext/skill/profile.go index 30edca97cd..5a4cb99a72 100644 --- a/internal/skill/profile.go +++ b/internal/ext/skill/profile.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" - "reasonix/internal/frontmatter" + "reasonix/internal/base/frontmatter" + "reasonix/internal/contract/config" ) var reservedSubagentSlashNames = map[string]bool{ diff --git a/internal/skill/reasonix_guide_test.go b/internal/ext/skill/reasonix_guide_test.go similarity index 97% rename from internal/skill/reasonix_guide_test.go rename to internal/ext/skill/reasonix_guide_test.go index 8e182c46a4..8fb5e2e01f 100644 --- a/internal/skill/reasonix_guide_test.go +++ b/internal/ext/skill/reasonix_guide_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "reasonix/internal/skill" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/skill" ) func TestReasonixGuideBuiltinRegistered(t *testing.T) { diff --git a/internal/skill/skill.go b/internal/ext/skill/skill.go similarity index 99% rename from internal/skill/skill.go rename to internal/ext/skill/skill.go index 287a52adce..a5386652fc 100644 --- a/internal/skill/skill.go +++ b/internal/ext/skill/skill.go @@ -24,11 +24,11 @@ import ( "sort" "strings" - "reasonix/internal/config" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/frontmatter" - "reasonix/internal/tool" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/frontmatter" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" ) // ErrInvocationUnavailable marks a profile/dependency gate that can become @@ -1351,7 +1351,7 @@ func dedupePaths(paths []string) []string { } // splitFrontmatter is a thin wrapper kept for internal use; the real parser -// lives in internal/frontmatter. +// lives in internal/base/frontmatter. func splitFrontmatter(s string) (map[string]string, string) { return frontmatter.SplitLegacy(s) } diff --git a/internal/skill/skill_extra_test.go b/internal/ext/skill/skill_extra_test.go similarity index 99% rename from internal/skill/skill_extra_test.go rename to internal/ext/skill/skill_extra_test.go index 16f9720479..813d564402 100644 --- a/internal/skill/skill_extra_test.go +++ b/internal/ext/skill/skill_extra_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // IsValidName diff --git a/internal/skill/skill_test.go b/internal/ext/skill/skill_test.go similarity index 99% rename from internal/skill/skill_test.go rename to internal/ext/skill/skill_test.go index 8073234a72..e6fa10a8c9 100644 --- a/internal/skill/skill_test.go +++ b/internal/ext/skill/skill_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/config" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func writeSkill(t *testing.T, base, rel, content string) string { diff --git a/internal/skill/tools.go b/internal/ext/skill/tools.go similarity index 99% rename from internal/skill/tools.go rename to internal/ext/skill/tools.go index 8c34feac89..f70fa7167b 100644 --- a/internal/skill/tools.go +++ b/internal/ext/skill/tools.go @@ -10,8 +10,8 @@ import ( "gopkg.in/yaml.v3" - "reasonix/internal/event" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) // SubagentRunner runs a runAs=subagent skill: it spawns an isolated child loop diff --git a/internal/skill/tools_test.go b/internal/ext/skill/tools_test.go similarity index 99% rename from internal/skill/tools_test.go rename to internal/ext/skill/tools_test.go index 1b1a9aea57..139c0d5f1e 100644 --- a/internal/skill/tools_test.go +++ b/internal/ext/skill/tools_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) func TestPreparePluginSkillBindsMCPNamesAndAllowedTools(t *testing.T) { diff --git a/internal/theme/asset.go b/internal/ext/theme/asset.go similarity index 100% rename from internal/theme/asset.go rename to internal/ext/theme/asset.go diff --git a/internal/theme/asset_test.go b/internal/ext/theme/asset_test.go similarity index 99% rename from internal/theme/asset_test.go rename to internal/ext/theme/asset_test.go index e1015bed46..5b700367f7 100644 --- a/internal/theme/asset_test.go +++ b/internal/ext/theme/asset_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // The id reaches this from a URL path, so an id that walks out of the pack diff --git a/internal/theme/builtin/official-cloudsea-gilt.json b/internal/ext/theme/builtin/official-cloudsea-gilt.json similarity index 100% rename from internal/theme/builtin/official-cloudsea-gilt.json rename to internal/ext/theme/builtin/official-cloudsea-gilt.json diff --git a/internal/theme/builtin/official-crimson-horizon.background.webp b/internal/ext/theme/builtin/official-crimson-horizon.background.webp similarity index 100% rename from internal/theme/builtin/official-crimson-horizon.background.webp rename to internal/ext/theme/builtin/official-crimson-horizon.background.webp diff --git a/internal/theme/builtin/official-crimson-horizon.json b/internal/ext/theme/builtin/official-crimson-horizon.json similarity index 100% rename from internal/theme/builtin/official-crimson-horizon.json rename to internal/ext/theme/builtin/official-crimson-horizon.json diff --git a/internal/theme/builtin/official-crimson-horizon.preview.webp b/internal/ext/theme/builtin/official-crimson-horizon.preview.webp similarity index 100% rename from internal/theme/builtin/official-crimson-horizon.preview.webp rename to internal/ext/theme/builtin/official-crimson-horizon.preview.webp diff --git a/internal/theme/builtin/official-cyan-stage.background.webp b/internal/ext/theme/builtin/official-cyan-stage.background.webp similarity index 100% rename from internal/theme/builtin/official-cyan-stage.background.webp rename to internal/ext/theme/builtin/official-cyan-stage.background.webp diff --git a/internal/theme/builtin/official-cyan-stage.json b/internal/ext/theme/builtin/official-cyan-stage.json similarity index 100% rename from internal/theme/builtin/official-cyan-stage.json rename to internal/ext/theme/builtin/official-cyan-stage.json diff --git a/internal/theme/builtin/official-cyan-stage.preview.webp b/internal/ext/theme/builtin/official-cyan-stage.preview.webp similarity index 100% rename from internal/theme/builtin/official-cyan-stage.preview.webp rename to internal/ext/theme/builtin/official-cyan-stage.preview.webp diff --git a/internal/theme/builtin/official-fortune-forge.background.webp b/internal/ext/theme/builtin/official-fortune-forge.background.webp similarity index 100% rename from internal/theme/builtin/official-fortune-forge.background.webp rename to internal/ext/theme/builtin/official-fortune-forge.background.webp diff --git a/internal/theme/builtin/official-fortune-forge.json b/internal/ext/theme/builtin/official-fortune-forge.json similarity index 100% rename from internal/theme/builtin/official-fortune-forge.json rename to internal/ext/theme/builtin/official-fortune-forge.json diff --git a/internal/theme/builtin/official-fortune-forge.preview.webp b/internal/ext/theme/builtin/official-fortune-forge.preview.webp similarity index 100% rename from internal/theme/builtin/official-fortune-forge.preview.webp rename to internal/ext/theme/builtin/official-fortune-forge.preview.webp diff --git a/internal/theme/builtin/official-noir-gold.background.webp b/internal/ext/theme/builtin/official-noir-gold.background.webp similarity index 100% rename from internal/theme/builtin/official-noir-gold.background.webp rename to internal/ext/theme/builtin/official-noir-gold.background.webp diff --git a/internal/theme/builtin/official-noir-gold.json b/internal/ext/theme/builtin/official-noir-gold.json similarity index 100% rename from internal/theme/builtin/official-noir-gold.json rename to internal/ext/theme/builtin/official-noir-gold.json diff --git a/internal/theme/builtin/official-noir-gold.preview.webp b/internal/ext/theme/builtin/official-noir-gold.preview.webp similarity index 100% rename from internal/theme/builtin/official-noir-gold.preview.webp rename to internal/ext/theme/builtin/official-noir-gold.preview.webp diff --git a/internal/theme/builtin/official-rose-dawn.background.webp b/internal/ext/theme/builtin/official-rose-dawn.background.webp similarity index 100% rename from internal/theme/builtin/official-rose-dawn.background.webp rename to internal/ext/theme/builtin/official-rose-dawn.background.webp diff --git a/internal/theme/builtin/official-rose-dawn.json b/internal/ext/theme/builtin/official-rose-dawn.json similarity index 100% rename from internal/theme/builtin/official-rose-dawn.json rename to internal/ext/theme/builtin/official-rose-dawn.json diff --git a/internal/theme/builtin/official-rose-dawn.preview.webp b/internal/ext/theme/builtin/official-rose-dawn.preview.webp similarity index 100% rename from internal/theme/builtin/official-rose-dawn.preview.webp rename to internal/ext/theme/builtin/official-rose-dawn.preview.webp diff --git a/internal/theme/builtin/official-sage-breeze.background.webp b/internal/ext/theme/builtin/official-sage-breeze.background.webp similarity index 100% rename from internal/theme/builtin/official-sage-breeze.background.webp rename to internal/ext/theme/builtin/official-sage-breeze.background.webp diff --git a/internal/theme/builtin/official-sage-breeze.json b/internal/ext/theme/builtin/official-sage-breeze.json similarity index 100% rename from internal/theme/builtin/official-sage-breeze.json rename to internal/ext/theme/builtin/official-sage-breeze.json diff --git a/internal/theme/builtin/official-sage-breeze.preview.webp b/internal/ext/theme/builtin/official-sage-breeze.preview.webp similarity index 100% rename from internal/theme/builtin/official-sage-breeze.preview.webp rename to internal/ext/theme/builtin/official-sage-breeze.preview.webp diff --git a/internal/theme/builtin/official-spark-notebook.background.webp b/internal/ext/theme/builtin/official-spark-notebook.background.webp similarity index 100% rename from internal/theme/builtin/official-spark-notebook.background.webp rename to internal/ext/theme/builtin/official-spark-notebook.background.webp diff --git a/internal/theme/builtin/official-spark-notebook.json b/internal/ext/theme/builtin/official-spark-notebook.json similarity index 100% rename from internal/theme/builtin/official-spark-notebook.json rename to internal/ext/theme/builtin/official-spark-notebook.json diff --git a/internal/theme/builtin/official-spark-notebook.preview.webp b/internal/ext/theme/builtin/official-spark-notebook.preview.webp similarity index 100% rename from internal/theme/builtin/official-spark-notebook.preview.webp rename to internal/ext/theme/builtin/official-spark-notebook.preview.webp diff --git a/internal/theme/builtin/official-violet-starlight.background.webp b/internal/ext/theme/builtin/official-violet-starlight.background.webp similarity index 100% rename from internal/theme/builtin/official-violet-starlight.background.webp rename to internal/ext/theme/builtin/official-violet-starlight.background.webp diff --git a/internal/theme/builtin/official-violet-starlight.json b/internal/ext/theme/builtin/official-violet-starlight.json similarity index 100% rename from internal/theme/builtin/official-violet-starlight.json rename to internal/ext/theme/builtin/official-violet-starlight.json diff --git a/internal/theme/builtin/official-violet-starlight.preview.webp b/internal/ext/theme/builtin/official-violet-starlight.preview.webp similarity index 100% rename from internal/theme/builtin/official-violet-starlight.preview.webp rename to internal/ext/theme/builtin/official-violet-starlight.preview.webp diff --git a/internal/theme/plugin.go b/internal/ext/theme/plugin.go similarity index 95% rename from internal/theme/plugin.go rename to internal/ext/theme/plugin.go index f87dae5019..1ec99d6ecc 100644 --- a/internal/theme/plugin.go +++ b/internal/ext/theme/plugin.go @@ -4,8 +4,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" - "reasonix/internal/pluginpkg" + "reasonix/internal/contract/config" + "reasonix/internal/ext/pluginpkg" ) // A pack an enabled plugin package contributes is read in place from the diff --git a/internal/theme/plugin_test.go b/internal/ext/theme/plugin_test.go similarity index 96% rename from internal/theme/plugin_test.go rename to internal/ext/theme/plugin_test.go index 99efeb6e2c..2b46812020 100644 --- a/internal/theme/plugin_test.go +++ b/internal/ext/theme/plugin_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) func installThemePlugin(t *testing.T, home string, enabled bool) string { diff --git a/internal/theme/theme.go b/internal/ext/theme/theme.go similarity index 99% rename from internal/theme/theme.go rename to internal/ext/theme/theme.go index c56d08b2ff..e7b0a2d5b3 100644 --- a/internal/theme/theme.go +++ b/internal/ext/theme/theme.go @@ -15,7 +15,7 @@ import ( "sort" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // The packs that ship: manifest, background, and preview for each. diff --git a/internal/theme/theme_test.go b/internal/ext/theme/theme_test.go similarity index 99% rename from internal/theme/theme_test.go rename to internal/ext/theme/theme_test.go index 67c7806714..7747af086e 100644 --- a/internal/theme/theme_test.go +++ b/internal/ext/theme/theme_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writePack(t *testing.T, root, id, body string) { diff --git a/internal/theme/tokens.go b/internal/ext/theme/tokens.go similarity index 100% rename from internal/theme/tokens.go rename to internal/ext/theme/tokens.go diff --git a/internal/theme/tokens_test.go b/internal/ext/theme/tokens_test.go similarity index 98% rename from internal/theme/tokens_test.go rename to internal/ext/theme/tokens_test.go index 88a70b217f..c4fea9e630 100644 --- a/internal/theme/tokens_test.go +++ b/internal/ext/theme/tokens_test.go @@ -205,7 +205,7 @@ func TestShippedPacksMeetSyntaxContrast(t *testing.T) { // frontend's; a token one side knows and the other does not is either accepted // and never painted, or painted and never accepted. func TestThemeTokenVocabularyMatchesTheFrontend(t *testing.T) { - src, err := os.ReadFile(filepath.Join("..", "..", "desktop", "frontend-next", "src", "ui", "theme.ts")) + src, err := os.ReadFile(filepath.Join("..", "..", "..", "desktop", "frontend-next", "src", "ui", "theme.ts")) if err != nil { t.Skipf("frontend source not present: %v", err) } diff --git a/internal/acp/client_integration_test.go b/internal/frontend/acp/client_integration_test.go similarity index 98% rename from internal/acp/client_integration_test.go rename to internal/frontend/acp/client_integration_test.go index 06436475bb..27e3635ed8 100644 --- a/internal/acp/client_integration_test.go +++ b/internal/frontend/acp/client_integration_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/session/control" ) // scriptedRequester answers agent → client requests from a per-method script diff --git a/internal/acp/clientio.go b/internal/frontend/acp/clientio.go similarity index 99% rename from internal/acp/clientio.go rename to internal/frontend/acp/clientio.go index bba6bf8f8f..0e137a419f 100644 --- a/internal/acp/clientio.go +++ b/internal/frontend/acp/clientio.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "reasonix/internal/tool/builtin" + "reasonix/internal/tools/builtin" ) // requester is the slice of Conn that clientIO drives: agent → client requests. diff --git a/internal/acp/dispatch.go b/internal/frontend/acp/dispatch.go similarity index 98% rename from internal/acp/dispatch.go rename to internal/frontend/acp/dispatch.go index 513131a00a..4747690897 100644 --- a/internal/acp/dispatch.go +++ b/internal/frontend/acp/dispatch.go @@ -10,13 +10,13 @@ import ( "sync" "unicode/utf8" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/session/control" ) // notifier is the slice of Conn the dispatch sink depends on: it pushes diff --git a/internal/acp/dispatch_extension_test.go b/internal/frontend/acp/dispatch_extension_test.go similarity index 98% rename from internal/acp/dispatch_extension_test.go rename to internal/frontend/acp/dispatch_extension_test.go index 70af1c4c6e..e3e7a0dfc3 100644 --- a/internal/acp/dispatch_extension_test.go +++ b/internal/frontend/acp/dispatch_extension_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/uihub" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/uihub" + "reasonix/internal/session/control" ) func extStatusEvent(severity string) event.Event { diff --git a/internal/acp/dispatch_partial_test.go b/internal/frontend/acp/dispatch_partial_test.go similarity index 96% rename from internal/acp/dispatch_partial_test.go rename to internal/frontend/acp/dispatch_partial_test.go index 62f12c1318..17a873a63f 100644 --- a/internal/acp/dispatch_partial_test.go +++ b/internal/frontend/acp/dispatch_partial_test.go @@ -3,7 +3,7 @@ package acp import ( "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // TestUpdateSinkSkipsPartialDispatch probes the ACP adapter against the early diff --git a/internal/acp/dispatch_test.go b/internal/frontend/acp/dispatch_test.go similarity index 99% rename from internal/acp/dispatch_test.go rename to internal/frontend/acp/dispatch_test.go index 7f6d913cad..56486d4a5c 100644 --- a/internal/acp/dispatch_test.go +++ b/internal/frontend/acp/dispatch_test.go @@ -10,11 +10,11 @@ import ( "time" "unicode/utf8" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // fakeNotifier captures Notify calls and answers Request via an injectable hook, diff --git a/internal/acp/e2e_test.go b/internal/frontend/acp/e2e_test.go similarity index 98% rename from internal/acp/e2e_test.go rename to internal/frontend/acp/e2e_test.go index 62c39aae3e..dc296940d5 100644 --- a/internal/acp/e2e_test.go +++ b/internal/frontend/acp/e2e_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/session/control" ) // These tests drive the full real stack — acp.Serve → control.Controller → diff --git a/internal/acp/extension_models.go b/internal/frontend/acp/extension_models.go similarity index 96% rename from internal/acp/extension_models.go rename to internal/frontend/acp/extension_models.go index b440ec60b3..ed0d4e4bc6 100644 --- a/internal/acp/extension_models.go +++ b/internal/frontend/acp/extension_models.go @@ -3,8 +3,8 @@ package acp import ( "strings" - "reasonix/internal/extension/providerext" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/providerext" ) // enrichStateWithExtensionModels folds a live controller's merged provider diff --git a/internal/acp/extension_models_test.go b/internal/frontend/acp/extension_models_test.go similarity index 96% rename from internal/acp/extension_models_test.go rename to internal/frontend/acp/extension_models_test.go index 776ba769aa..1516401b4b 100644 --- a/internal/acp/extension_models_test.go +++ b/internal/frontend/acp/extension_models_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) func TestEnrichStateWithExtensionModels(t *testing.T) { diff --git a/internal/acp/inbox.go b/internal/frontend/acp/inbox.go similarity index 98% rename from internal/acp/inbox.go rename to internal/frontend/acp/inbox.go index 2f934ae2d2..85be7bdd3e 100644 --- a/internal/acp/inbox.go +++ b/internal/frontend/acp/inbox.go @@ -5,8 +5,8 @@ import ( "encoding/json" "strings" - "reasonix/internal/control" - "reasonix/internal/sessioninbox" + "reasonix/internal/session/control" + "reasonix/internal/state/sessioninbox" ) func (s *service) sessionAPI(sess *acpSession) (control.EditorAPI, error) { diff --git a/internal/acp/inbox_drain.go b/internal/frontend/acp/inbox_drain.go similarity index 95% rename from internal/acp/inbox_drain.go rename to internal/frontend/acp/inbox_drain.go index 383952e43d..e9a4f0bf46 100644 --- a/internal/acp/inbox_drain.go +++ b/internal/frontend/acp/inbox_drain.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "reasonix/internal/sessioninbox" + "reasonix/internal/state/sessioninbox" ) type acpInboxController interface { diff --git a/internal/acp/inbox_drain_test.go b/internal/frontend/acp/inbox_drain_test.go similarity index 95% rename from internal/acp/inbox_drain_test.go rename to internal/frontend/acp/inbox_drain_test.go index e52ca2ab76..70c6d5e605 100644 --- a/internal/acp/inbox_drain_test.go +++ b/internal/frontend/acp/inbox_drain_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/session/control" ) type durableQueueFactory struct { diff --git a/internal/acp/live_test.go b/internal/frontend/acp/live_test.go similarity index 91% rename from internal/acp/live_test.go rename to internal/frontend/acp/live_test.go index 46851654e3..c28c22fea8 100644 --- a/internal/acp/live_test.go +++ b/internal/frontend/acp/live_test.go @@ -4,7 +4,7 @@ // build tag. Run it against a real model with: // // set -a; . /path/to/.env; set +a -// go test -tags live -run Live ./internal/acp/ -v +// go test -tags live -run Live ./internal/frontend/acp/ -v // // It drives the full ACP stack — acp.Serve → control.Controller → agent.Agent → // the real OpenAI-compatible provider — over a tiny prompt, proving the live @@ -18,11 +18,11 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/provider" - _ "reasonix/internal/provider/openai" // registers the "openai" provider kind - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + _ "reasonix/internal/model/openai" // registers the "openai" provider kind + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) type liveFactory struct{ prov provider.Provider } diff --git a/internal/acp/protocol.go b/internal/frontend/acp/protocol.go similarity index 100% rename from internal/acp/protocol.go rename to internal/frontend/acp/protocol.go diff --git a/internal/acp/protocol_test.go b/internal/frontend/acp/protocol_test.go similarity index 99% rename from internal/acp/protocol_test.go rename to internal/frontend/acp/protocol_test.go index fb2f922003..fd6f310a6f 100644 --- a/internal/acp/protocol_test.go +++ b/internal/frontend/acp/protocol_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestFlattenPrompt(t *testing.T) { diff --git a/internal/acp/reload_extensions_test.go b/internal/frontend/acp/reload_extensions_test.go similarity index 98% rename from internal/acp/reload_extensions_test.go rename to internal/frontend/acp/reload_extensions_test.go index ae2e9e290f..6cef6bdf14 100644 --- a/internal/acp/reload_extensions_test.go +++ b/internal/frontend/acp/reload_extensions_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/command" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/command" + "reasonix/internal/session/control" ) // reloadFactory wraps configurableFactory with the SessionRebuilder seam the diff --git a/internal/acp/role_switch_race_test.go b/internal/frontend/acp/role_switch_race_test.go similarity index 94% rename from internal/acp/role_switch_race_test.go rename to internal/frontend/acp/role_switch_race_test.go index 638de6f7ca..9760936e42 100644 --- a/internal/acp/role_switch_race_test.go +++ b/internal/frontend/acp/role_switch_race_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/control" + "reasonix/internal/session/control" ) func TestACPBeginRefusesWhileStateChangeIsInFlight(t *testing.T) { diff --git a/internal/acp/server.go b/internal/frontend/acp/server.go similarity index 100% rename from internal/acp/server.go rename to internal/frontend/acp/server.go diff --git a/internal/acp/server_test.go b/internal/frontend/acp/server_test.go similarity index 99% rename from internal/acp/server_test.go rename to internal/frontend/acp/server_test.go index d880d7d2a9..18d842899c 100644 --- a/internal/acp/server_test.go +++ b/internal/frontend/acp/server_test.go @@ -13,17 +13,17 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/agent/testutil" - "reasonix/internal/command" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/hook" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/command" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/agent/testutil" + "reasonix/internal/runtime/jobs" + "reasonix/internal/session/control" ) // fakes: a Factory wrapping a behavior-driven runner in a real Controller diff --git a/internal/acp/service.go b/internal/frontend/acp/service.go similarity index 99% rename from internal/acp/service.go rename to internal/frontend/acp/service.go index e162892ab4..c7813eb540 100644 --- a/internal/acp/service.go +++ b/internal/frontend/acp/service.go @@ -15,15 +15,15 @@ import ( "sync" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/extension/uihub" - "reasonix/internal/jobs" - "reasonix/internal/plugin" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/tool/builtin" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension/uihub" + "reasonix/internal/ext/plugin" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" + "reasonix/internal/session/control" + "reasonix/internal/state/store" + "reasonix/internal/tools/builtin" ) // SessionParams is everything a Factory needs to assemble one ACP session's diff --git a/internal/acp/service_lease_test.go b/internal/frontend/acp/service_lease_test.go similarity index 95% rename from internal/acp/service_lease_test.go rename to internal/frontend/acp/service_lease_test.go index d28749d522..da04bc6a1f 100644 --- a/internal/acp/service_lease_test.go +++ b/internal/frontend/acp/service_lease_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" ) func leaseTestFactory(dir string) *e2eFactory { diff --git a/internal/acp/service_lock_test.go b/internal/frontend/acp/service_lock_test.go similarity index 99% rename from internal/acp/service_lock_test.go rename to internal/frontend/acp/service_lock_test.go index 9aa5a07d05..4c31391992 100644 --- a/internal/acp/service_lock_test.go +++ b/internal/frontend/acp/service_lock_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/session/control" ) type snapshotLockProbeController struct { diff --git a/internal/acp/session.go b/internal/frontend/acp/session.go similarity index 99% rename from internal/acp/session.go rename to internal/frontend/acp/session.go index a3c8c50cb9..5c0f62580d 100644 --- a/internal/acp/session.go +++ b/internal/frontend/acp/session.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/sessioninbox" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" + "reasonix/internal/state/sessioninbox" ) // sessionLeaseBindError maps a lease-acquisition failure to the protocol diff --git a/internal/acp/session_config.go b/internal/frontend/acp/session_config.go similarity index 99% rename from internal/acp/session_config.go rename to internal/frontend/acp/session_config.go index c7a209c96d..6d7554fb62 100644 --- a/internal/acp/session_config.go +++ b/internal/frontend/acp/session_config.go @@ -8,8 +8,8 @@ import ( "context" "strings" - "reasonix/internal/control" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/session/control" ) // swapModeID records the mode reported to the client and returns the previous diff --git a/internal/acp/session_files_test.go b/internal/frontend/acp/session_files_test.go similarity index 90% rename from internal/acp/session_files_test.go rename to internal/frontend/acp/session_files_test.go index a6cfc20e93..af5fc6e1c2 100644 --- a/internal/acp/session_files_test.go +++ b/internal/frontend/acp/session_files_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) func TestDeleteSessionFilesSweepsEventLogAndSidecars(t *testing.T) { diff --git a/internal/acp/session_meta.go b/internal/frontend/acp/session_meta.go similarity index 97% rename from internal/acp/session_meta.go rename to internal/frontend/acp/session_meta.go index 29b336bbc5..d1a608bfb3 100644 --- a/internal/acp/session_meta.go +++ b/internal/frontend/acp/session_meta.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/provider" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func (s *acpSession) saveMetaIfPresent() { diff --git a/internal/acp/session_write_authority.go b/internal/frontend/acp/session_write_authority.go similarity index 98% rename from internal/acp/session_write_authority.go rename to internal/frontend/acp/session_write_authority.go index dd546f8ff1..832c04e7c3 100644 --- a/internal/acp/session_write_authority.go +++ b/internal/frontend/acp/session_write_authority.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/control" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // bindACPWriteAuthority issues a generation-bound write authority when ctrl is diff --git a/internal/acp/status.go b/internal/frontend/acp/status.go similarity index 99% rename from internal/acp/status.go rename to internal/frontend/acp/status.go index a3cf30aab9..c1b3224493 100644 --- a/internal/acp/status.go +++ b/internal/frontend/acp/status.go @@ -11,12 +11,12 @@ import ( "sync" "time" - "reasonix/internal/agent" - "reasonix/internal/billing" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) const ( diff --git a/internal/acp/status_test.go b/internal/frontend/acp/status_test.go similarity index 98% rename from internal/acp/status_test.go rename to internal/frontend/acp/status_test.go index 5e95135162..a94f6a4140 100644 --- a/internal/acp/status_test.go +++ b/internal/frontend/acp/status_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" + "reasonix/internal/runtime/agent" ) type statusFactory struct { diff --git a/internal/acp/switch_recovery_test.go b/internal/frontend/acp/switch_recovery_test.go similarity index 99% rename from internal/acp/switch_recovery_test.go rename to internal/frontend/acp/switch_recovery_test.go index ab5b205dc1..e446f33897 100644 --- a/internal/acp/switch_recovery_test.go +++ b/internal/frontend/acp/switch_recovery_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // divergedACPSession writes a transcript to path whose on-disk content has diff --git a/internal/acp/terminal_env_test.go b/internal/frontend/acp/terminal_env_test.go similarity index 100% rename from internal/acp/terminal_env_test.go rename to internal/frontend/acp/terminal_env_test.go diff --git a/internal/capdiag/collect.go b/internal/frontend/capdiag/collect.go similarity index 98% rename from internal/capdiag/collect.go rename to internal/frontend/capdiag/collect.go index 673990de13..39cce18372 100644 --- a/internal/capdiag/collect.go +++ b/internal/frontend/capdiag/collect.go @@ -7,14 +7,14 @@ import ( "strings" "time" - "reasonix/internal/command" - "reasonix/internal/config" - "reasonix/internal/hook" - "reasonix/internal/memory" - "reasonix/internal/plugin" - "reasonix/internal/pluginpkg" - "reasonix/internal/secrets" - "reasonix/internal/skill" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/config" + "reasonix/internal/ext/command" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/ext/skill" + "reasonix/internal/state/memory" ) // Collect builds a capability diagnostics report. It never writes config, diff --git a/internal/capdiag/collect_test.go b/internal/frontend/capdiag/collect_test.go similarity index 99% rename from internal/capdiag/collect_test.go rename to internal/frontend/capdiag/collect_test.go index f73369a2b3..5e151680e1 100644 --- a/internal/capdiag/collect_test.go +++ b/internal/frontend/capdiag/collect_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/capdiag" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/frontend/capdiag" ) func TestCollectStaticNoNetworkSideEffects(t *testing.T) { diff --git a/internal/capdiag/collect_v1_test.go b/internal/frontend/capdiag/collect_v1_test.go similarity index 97% rename from internal/capdiag/collect_v1_test.go rename to internal/frontend/capdiag/collect_v1_test.go index 0fc814ebe4..b3d495a714 100644 --- a/internal/capdiag/collect_v1_test.go +++ b/internal/frontend/capdiag/collect_v1_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/capdiag" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/frontend/capdiag" ) // TestPluginPackageV2FieldsAreReported pins the Manifest v2 additions to the diff --git a/internal/capdiag/hook_issues.go b/internal/frontend/capdiag/hook_issues.go similarity index 98% rename from internal/capdiag/hook_issues.go rename to internal/frontend/capdiag/hook_issues.go index f21c853006..ce2abd6eca 100644 --- a/internal/capdiag/hook_issues.go +++ b/internal/frontend/capdiag/hook_issues.go @@ -4,7 +4,7 @@ package capdiag import ( "strings" - "reasonix/internal/hook" + "reasonix/internal/ext/hook" ) func hookRuntimeIssue(entry hook.Entry, err error, disp func(string) string) (Issue, bool) { diff --git a/internal/capdiag/hook_runtime_test.go b/internal/frontend/capdiag/hook_runtime_test.go similarity index 97% rename from internal/capdiag/hook_runtime_test.go rename to internal/frontend/capdiag/hook_runtime_test.go index 5af77d6ae1..9ddd3bee06 100644 --- a/internal/capdiag/hook_runtime_test.go +++ b/internal/frontend/capdiag/hook_runtime_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "reasonix/internal/hook" + "reasonix/internal/ext/hook" ) func TestHookRuntimeIssueIsActionableAndScoped(t *testing.T) { diff --git a/internal/capdiag/live.go b/internal/frontend/capdiag/live.go similarity index 97% rename from internal/capdiag/live.go rename to internal/frontend/capdiag/live.go index 0b38ee7760..3c86224fbe 100644 --- a/internal/capdiag/live.go +++ b/internal/frontend/capdiag/live.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/plugin" - "reasonix/internal/pluginspec" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/pluginspec" ) func lookPath(cmd string) (string, error) { diff --git a/internal/capdiag/paths.go b/internal/frontend/capdiag/paths.go similarity index 100% rename from internal/capdiag/paths.go rename to internal/frontend/capdiag/paths.go diff --git a/internal/capdiag/render.go b/internal/frontend/capdiag/render.go similarity index 100% rename from internal/capdiag/render.go rename to internal/frontend/capdiag/render.go diff --git a/internal/capdiag/sanitize_test.go b/internal/frontend/capdiag/sanitize_test.go similarity index 98% rename from internal/capdiag/sanitize_test.go rename to internal/frontend/capdiag/sanitize_test.go index b2b8798be4..3767a60a7c 100644 --- a/internal/capdiag/sanitize_test.go +++ b/internal/frontend/capdiag/sanitize_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestSanitizeErrTextRedactsSecretsAndPaths(t *testing.T) { diff --git a/internal/capdiag/types.go b/internal/frontend/capdiag/types.go similarity index 99% rename from internal/capdiag/types.go rename to internal/frontend/capdiag/types.go index fdd2e4c25c..975edd263f 100644 --- a/internal/capdiag/types.go +++ b/internal/frontend/capdiag/types.go @@ -6,7 +6,7 @@ package capdiag import ( "time" - "reasonix/internal/plugin" + "reasonix/internal/ext/plugin" ) // SchemaVersion is the JSON report version. Bump only on breaking shape changes. diff --git a/internal/cli/account.go b/internal/frontend/cli/account.go similarity index 97% rename from internal/cli/account.go rename to internal/frontend/cli/account.go index 1a2addb8c3..cb6eab0ae0 100644 --- a/internal/cli/account.go +++ b/internal/frontend/cli/account.go @@ -8,9 +8,9 @@ import ( "os/signal" "strings" - "reasonix/internal/account" - "reasonix/internal/config" - "reasonix/internal/netclient" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/platform/account" ) // An account is for the parts of Reasonix that are inherently networked — the diff --git a/internal/cli/acp.go b/internal/frontend/cli/acp.go similarity index 97% rename from internal/cli/acp.go rename to internal/frontend/cli/acp.go index 0e76c4d66e..cdddf0cc13 100644 --- a/internal/cli/acp.go +++ b/internal/frontend/cli/acp.go @@ -11,19 +11,19 @@ import ( "strings" "time" - "reasonix/internal/ablation" - "reasonix/internal/acp" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/extension/providerext" - "reasonix/internal/i18n" - "reasonix/internal/netclient" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/surface" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/i18n" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension/providerext" + "reasonix/internal/frontend/acp" + "reasonix/internal/safety/sandbox" + "reasonix/internal/session/control" + "reasonix/internal/tools/builtin" ) // acpCommand runs Reasonix as an Agent Client Protocol agent: a stdio JSON-RPC diff --git a/internal/cli/acp_extension_test.go b/internal/frontend/cli/acp_extension_test.go similarity index 97% rename from internal/cli/acp_extension_test.go rename to internal/frontend/cli/acp_extension_test.go index 80b7083a9c..ad83a656c4 100644 --- a/internal/cli/acp_extension_test.go +++ b/internal/frontend/cli/acp_extension_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "reasonix/internal/acp" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/pluginpkg" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/frontend/acp" ) // ACP-level coverage for extension-hosted providers: a plugin/... model in diff --git a/internal/cli/acp_test.go b/internal/frontend/cli/acp_test.go similarity index 97% rename from internal/cli/acp_test.go rename to internal/frontend/cli/acp_test.go index 10061dbce8..d59cd771a4 100644 --- a/internal/cli/acp_test.go +++ b/internal/frontend/cli/acp_test.go @@ -7,15 +7,15 @@ import ( "strings" "testing" - "reasonix/internal/acp" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/netclient" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/frontend/acp" - "reasonix/internal/testenv" - _ "reasonix/internal/tool/builtin" + "reasonix/internal/base/testenv" + _ "reasonix/internal/tools/builtin" ) const acpTestProviderKind = "acp-test-provider" diff --git a/internal/cli/ansi_console_other.go b/internal/frontend/cli/ansi_console_other.go similarity index 100% rename from internal/cli/ansi_console_other.go rename to internal/frontend/cli/ansi_console_other.go diff --git a/internal/cli/ansi_console_windows.go b/internal/frontend/cli/ansi_console_windows.go similarity index 100% rename from internal/cli/ansi_console_windows.go rename to internal/frontend/cli/ansi_console_windows.go diff --git a/internal/cli/bench_flags.go b/internal/frontend/cli/bench_flags.go similarity index 93% rename from internal/cli/bench_flags.go rename to internal/frontend/cli/bench_flags.go index 5a3616309e..0b8cfeeec3 100644 --- a/internal/cli/bench_flags.go +++ b/internal/frontend/cli/bench_flags.go @@ -4,7 +4,7 @@ package cli import ( "github.com/spf13/pflag" - "reasonix/internal/ablation" + "reasonix/internal/contract/ablation" ) // registerArmFlags declares both benchmark axes together, so a frontend cannot diff --git a/internal/cli/box.go b/internal/frontend/cli/box.go similarity index 100% rename from internal/cli/box.go rename to internal/frontend/cli/box.go diff --git a/internal/cli/box_test.go b/internal/frontend/cli/box_test.go similarity index 100% rename from internal/cli/box_test.go rename to internal/frontend/cli/box_test.go diff --git a/internal/cli/branch.go b/internal/frontend/cli/branch.go similarity index 100% rename from internal/cli/branch.go rename to internal/frontend/cli/branch.go diff --git a/internal/cli/branch_test.go b/internal/frontend/cli/branch_test.go similarity index 100% rename from internal/cli/branch_test.go rename to internal/frontend/cli/branch_test.go diff --git a/internal/cli/build_options.go b/internal/frontend/cli/build_options.go similarity index 92% rename from internal/cli/build_options.go rename to internal/frontend/cli/build_options.go index 0f74290384..595d8b9441 100644 --- a/internal/cli/build_options.go +++ b/internal/frontend/cli/build_options.go @@ -4,14 +4,14 @@ import ( "context" "io" - "reasonix/internal/ablation" - "reasonix/internal/boot" - "reasonix/internal/browser" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/sessiontemp" - "reasonix/internal/surface" + "reasonix/internal/assembly/boot" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/platform/browser" + "reasonix/internal/session/control" + "reasonix/internal/state/sessiontemp" ) type cliBuildOverrides struct { diff --git a/internal/cli/buildinfo.go b/internal/frontend/cli/buildinfo.go similarity index 100% rename from internal/cli/buildinfo.go rename to internal/frontend/cli/buildinfo.go diff --git a/internal/cli/buildinfo_test.go b/internal/frontend/cli/buildinfo_test.go similarity index 100% rename from internal/cli/buildinfo_test.go rename to internal/frontend/cli/buildinfo_test.go diff --git a/internal/cli/catalogs.go b/internal/frontend/cli/catalogs.go similarity index 98% rename from internal/cli/catalogs.go rename to internal/frontend/cli/catalogs.go index 598d2b5a16..5287769fd7 100644 --- a/internal/cli/catalogs.go +++ b/internal/frontend/cli/catalogs.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/projectiondb" + "reasonix/internal/contract/config" + "reasonix/internal/state/projectiondb" ) type catalogInspection struct { diff --git a/internal/cli/catalogs_history.go b/internal/frontend/cli/catalogs_history.go similarity index 95% rename from internal/cli/catalogs_history.go rename to internal/frontend/cli/catalogs_history.go index 192c334794..fcbd7b8b1c 100644 --- a/internal/cli/catalogs_history.go +++ b/internal/frontend/cli/catalogs_history.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "reasonix/internal/config" - "reasonix/internal/historycatalog" + "reasonix/internal/contract/config" + "reasonix/internal/state/historycatalog" ) func init() { diff --git a/internal/cli/catalogs_usage.go b/internal/frontend/cli/catalogs_usage.go similarity index 90% rename from internal/cli/catalogs_usage.go rename to internal/frontend/cli/catalogs_usage.go index 2488949ab8..5082a11646 100644 --- a/internal/cli/catalogs_usage.go +++ b/internal/frontend/cli/catalogs_usage.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "reasonix/internal/config" - "reasonix/internal/usagecatalog" + "reasonix/internal/contract/config" + "reasonix/internal/state/usagecatalog" ) func init() { diff --git a/internal/cli/cli.go b/internal/frontend/cli/cli.go similarity index 99% rename from internal/cli/cli.go rename to internal/frontend/cli/cli.go index 3e9815a302..768c38c7c7 100644 --- a/internal/cli/cli.go +++ b/internal/frontend/cli/cli.go @@ -25,17 +25,17 @@ import ( "time" "unicode/utf16" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/i18n" - "reasonix/internal/notify" - "reasonix/internal/provider/openai" - "reasonix/internal/telemetry" + "reasonix/internal/assembly/boot" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/model/openai" + "reasonix/internal/platform/notify" + "reasonix/internal/platform/telemetry" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" "github.com/spf13/pflag" "golang.org/x/term" @@ -242,7 +242,7 @@ func configureCLIThemeFromConfigForTTYOutput() { // setupProfile builds a ready-to-drive Controller from config via boot.Build. // The assembly (model resolution, tool registry, permission gate, two-model -// Coordinator) lives in internal/boot, shared with the desktop frontend. +// Coordinator) lives in internal/assembly/boot, shared with the desktop frontend. // requireKey forces the executor's API key to be present (used by run); chat // passes false so the session UI is reachable before a key is set. sink receives // the agent's typed event stream — runAgent passes a TextSink that renders to diff --git a/internal/cli/cli_flags.go b/internal/frontend/cli/cli_flags.go similarity index 99% rename from internal/cli/cli_flags.go rename to internal/frontend/cli/cli_flags.go index 6a6777177f..2b17a0d738 100644 --- a/internal/cli/cli_flags.go +++ b/internal/frontend/cli/cli_flags.go @@ -7,7 +7,7 @@ import ( "strings" "unicode" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) const resumePickerSentinel = "__reasonix_resume_picker__" diff --git a/internal/cli/cli_flags_test.go b/internal/frontend/cli/cli_flags_test.go similarity index 98% rename from internal/cli/cli_flags_test.go rename to internal/frontend/cli/cli_flags_test.go index 5a0b714b83..38c1f58e9c 100644 --- a/internal/cli/cli_flags_test.go +++ b/internal/frontend/cli/cli_flags_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/spf13/pflag" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func TestSplitAllowedToolRules(t *testing.T) { diff --git a/internal/cli/cli_test.go b/internal/frontend/cli/cli_test.go similarity index 99% rename from internal/cli/cli_test.go rename to internal/frontend/cli/cli_test.go index ff9e492805..1a3943fd2d 100644 --- a/internal/cli/cli_test.go +++ b/internal/frontend/cli/cli_test.go @@ -15,16 +15,16 @@ import ( "sync/atomic" "testing" - "reasonix/internal/agent" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/notify" - "reasonix/internal/provider" - "reasonix/internal/telemetry" - "reasonix/internal/testenv" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/i18n" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/platform/notify" + "reasonix/internal/platform/telemetry" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) func TestChdirTo(t *testing.T) { diff --git a/internal/cli/complete.go b/internal/frontend/cli/complete.go similarity index 100% rename from internal/cli/complete.go rename to internal/frontend/cli/complete.go diff --git a/internal/cli/context_window_prompt_test.go b/internal/frontend/cli/context_window_prompt_test.go similarity index 100% rename from internal/cli/context_window_prompt_test.go rename to internal/frontend/cli/context_window_prompt_test.go diff --git a/internal/cli/currency.go b/internal/frontend/cli/currency.go similarity index 100% rename from internal/cli/currency.go rename to internal/frontend/cli/currency.go diff --git a/internal/cli/default_model.go b/internal/frontend/cli/default_model.go similarity index 96% rename from internal/cli/default_model.go rename to internal/frontend/cli/default_model.go index a06bcd261e..6e87e7b329 100644 --- a/internal/cli/default_model.go +++ b/internal/frontend/cli/default_model.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/config" - "reasonix/internal/extension/providerext" + "reasonix/internal/contract/config" + "reasonix/internal/ext/extension/providerext" ) // resolveModelForCLI picks the chat model a CLI subcommand should boot on. A diff --git a/internal/cli/delegation_metrics_test.go b/internal/frontend/cli/delegation_metrics_test.go similarity index 98% rename from internal/cli/delegation_metrics_test.go rename to internal/frontend/cli/delegation_metrics_test.go index 6d9ce02b0c..d2d4a409c8 100644 --- a/internal/cli/delegation_metrics_test.go +++ b/internal/frontend/cli/delegation_metrics_test.go @@ -3,7 +3,7 @@ package cli import ( "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // The instrument must be able to say, from one run, whether delegation diff --git a/internal/cli/diffview.go b/internal/frontend/cli/diffview.go similarity index 99% rename from internal/cli/diffview.go rename to internal/frontend/cli/diffview.go index afa8414780..13087d1a45 100644 --- a/internal/cli/diffview.go +++ b/internal/frontend/cli/diffview.go @@ -15,8 +15,8 @@ import ( "github.com/alecthomas/chroma/v2/styles" "github.com/charmbracelet/x/ansi" - "reasonix/internal/event" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/event" ) const tabWidth = 4 diff --git a/internal/cli/diffview_test.go b/internal/frontend/cli/diffview_test.go similarity index 99% rename from internal/cli/diffview_test.go rename to internal/frontend/cli/diffview_test.go index dce587667b..e0ee1a6045 100644 --- a/internal/cli/diffview_test.go +++ b/internal/frontend/cli/diffview_test.go @@ -7,7 +7,7 @@ import ( "github.com/charmbracelet/colorprofile" "github.com/charmbracelet/x/ansi" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) func TestDiffBodyDropsHeadersKeepsLineNumbers(t *testing.T) { diff --git a/internal/cli/docs_manifest.go b/internal/frontend/cli/docs_manifest.go similarity index 98% rename from internal/cli/docs_manifest.go rename to internal/frontend/cli/docs_manifest.go index 4c7ce26e77..c9a9545547 100644 --- a/internal/cli/docs_manifest.go +++ b/internal/frontend/cli/docs_manifest.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/productdocs" + "reasonix/internal/tools/productdocs" ) // docsManifestCommand is an intentionally undocumented release/diagnostic diff --git a/internal/cli/doctor.go b/internal/frontend/cli/doctor.go similarity index 98% rename from internal/cli/doctor.go rename to internal/frontend/cli/doctor.go index 87b53dbecf..89fd4c616f 100644 --- a/internal/cli/doctor.go +++ b/internal/frontend/cli/doctor.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "reasonix/internal/config" - "reasonix/internal/doctor" - "reasonix/internal/repair" + "reasonix/internal/contract/config" + "reasonix/internal/frontend/doctor" + "reasonix/internal/platform/repair" ) func doctorBillingCommand(args []string) int { diff --git a/internal/cli/doctor_capabilities.go b/internal/frontend/cli/doctor_capabilities.go similarity index 98% rename from internal/cli/doctor_capabilities.go rename to internal/frontend/cli/doctor_capabilities.go index d25bce2198..cdffec88f5 100644 --- a/internal/cli/doctor_capabilities.go +++ b/internal/frontend/cli/doctor_capabilities.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "reasonix/internal/capdiag" + "reasonix/internal/frontend/capdiag" ) func doctorCapabilitiesCommand(args []string) int { diff --git a/internal/cli/doctor_capabilities_test.go b/internal/frontend/cli/doctor_capabilities_test.go similarity index 97% rename from internal/cli/doctor_capabilities_test.go rename to internal/frontend/cli/doctor_capabilities_test.go index 815183d7b2..983c541cc6 100644 --- a/internal/cli/doctor_capabilities_test.go +++ b/internal/frontend/cli/doctor_capabilities_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "reasonix/internal/capdiag" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/frontend/capdiag" ) func TestDoctorCapabilitiesStaticJSON(t *testing.T) { diff --git a/internal/cli/doctor_repair_test.go b/internal/frontend/cli/doctor_repair_test.go similarity index 96% rename from internal/cli/doctor_repair_test.go rename to internal/frontend/cli/doctor_repair_test.go index fe6a2a8d84..c72e7f6255 100644 --- a/internal/cli/doctor_repair_test.go +++ b/internal/frontend/cli/doctor_repair_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestDoctorRepairSkipsConfigStartupMutation(t *testing.T) { diff --git a/internal/cli/doctor_runtime.go b/internal/frontend/cli/doctor_runtime.go similarity index 94% rename from internal/cli/doctor_runtime.go rename to internal/frontend/cli/doctor_runtime.go index 9a37702308..236c25cb92 100644 --- a/internal/cli/doctor_runtime.go +++ b/internal/frontend/cli/doctor_runtime.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "reasonix/internal/boot" + "reasonix/internal/assembly/boot" ) func doctorRuntimeCommand(args []string) int { diff --git a/internal/cli/doctor_test.go b/internal/frontend/cli/doctor_test.go similarity index 98% rename from internal/cli/doctor_test.go rename to internal/frontend/cli/doctor_test.go index 664a4f8bf1..2e18d06551 100644 --- a/internal/cli/doctor_test.go +++ b/internal/frontend/cli/doctor_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func TestDoctorCommandPrintsJSON(t *testing.T) { diff --git a/internal/cli/extension_surface.go b/internal/frontend/cli/extension_surface.go similarity index 97% rename from internal/cli/extension_surface.go rename to internal/frontend/cli/extension_surface.go index 71fb684c58..5990fed8cd 100644 --- a/internal/cli/extension_surface.go +++ b/internal/frontend/cli/extension_surface.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/extension/uihub" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension/uihub" + "reasonix/internal/session/control" ) // Extension structured-UI rendering (Extension Protocol v2). The diff --git a/internal/cli/extension_surface_test.go b/internal/frontend/cli/extension_surface_test.go similarity index 98% rename from internal/cli/extension_surface_test.go rename to internal/frontend/cli/extension_surface_test.go index 8f6f85c0a8..06e8eb655c 100644 --- a/internal/cli/extension_surface_test.go +++ b/internal/frontend/cli/extension_surface_test.go @@ -7,9 +7,9 @@ import ( "github.com/charmbracelet/x/ansi" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/event" + "reasonix/internal/session/control" ) // extensionStubCtrl stubs the SessionAPI surface the extension slash dispatch diff --git a/internal/cli/flag_parse.go b/internal/frontend/cli/flag_parse.go similarity index 98% rename from internal/cli/flag_parse.go rename to internal/frontend/cli/flag_parse.go index 2dedb9b636..2ab1a9432d 100644 --- a/internal/cli/flag_parse.go +++ b/internal/frontend/cli/flag_parse.go @@ -8,7 +8,7 @@ import ( "io" "os" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" "github.com/spf13/pflag" ) diff --git a/internal/cli/flag_parse_test.go b/internal/frontend/cli/flag_parse_test.go similarity index 100% rename from internal/cli/flag_parse_test.go rename to internal/frontend/cli/flag_parse_test.go diff --git a/internal/cli/gitstatus.go b/internal/frontend/cli/gitstatus.go similarity index 96% rename from internal/cli/gitstatus.go rename to internal/frontend/cli/gitstatus.go index 080e4a5b43..457da979f2 100644 --- a/internal/cli/gitstatus.go +++ b/internal/frontend/cli/gitstatus.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "reasonix/internal/gitcmd" + "reasonix/internal/platform/gitcmd" ) func runGit(ctx context.Context, cwd string, args ...string) (string, error) { diff --git a/internal/cli/gitstatus_test.go b/internal/frontend/cli/gitstatus_test.go similarity index 97% rename from internal/cli/gitstatus_test.go rename to internal/frontend/cli/gitstatus_test.go index 5adcf04879..5edd454bae 100644 --- a/internal/cli/gitstatus_test.go +++ b/internal/frontend/cli/gitstatus_test.go @@ -7,7 +7,7 @@ import ( "runtime" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestParseGitNumstat(t *testing.T) { diff --git a/internal/cli/help_view.go b/internal/frontend/cli/help_view.go similarity index 95% rename from internal/cli/help_view.go rename to internal/frontend/cli/help_view.go index 8c9a87acfc..05d9e33f6a 100644 --- a/internal/cli/help_view.go +++ b/internal/frontend/cli/help_view.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "reasonix/internal/command" - "reasonix/internal/control" - "reasonix/internal/plugin" - "reasonix/internal/skill" + "reasonix/internal/ext/command" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" ) const helpMaxDynamicItems = 8 diff --git a/internal/cli/hide_other.go b/internal/frontend/cli/hide_other.go similarity index 100% rename from internal/cli/hide_other.go rename to internal/frontend/cli/hide_other.go diff --git a/internal/cli/hide_windows.go b/internal/frontend/cli/hide_windows.go similarity index 100% rename from internal/cli/hide_windows.go rename to internal/frontend/cli/hide_windows.go diff --git a/internal/cli/hook_machine.go b/internal/frontend/cli/hook_machine.go similarity index 99% rename from internal/cli/hook_machine.go rename to internal/frontend/cli/hook_machine.go index da1b778e7d..72b872f13d 100644 --- a/internal/cli/hook_machine.go +++ b/internal/frontend/cli/hook_machine.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "reasonix/internal/hook" + "reasonix/internal/ext/hook" ) type machineHook struct { diff --git a/internal/cli/hook_machine_test.go b/internal/frontend/cli/hook_machine_test.go similarity index 98% rename from internal/cli/hook_machine_test.go rename to internal/frontend/cli/hook_machine_test.go index 101fe82232..7ff607bf4b 100644 --- a/internal/cli/hook_machine_test.go +++ b/internal/frontend/cli/hook_machine_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/hook" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/hook" ) func TestHookMachineListRedactsCommandsAndEnablesProjectHooks(t *testing.T) { diff --git a/internal/cli/hooks_view.go b/internal/frontend/cli/hooks_view.go similarity index 96% rename from internal/cli/hooks_view.go rename to internal/frontend/cli/hooks_view.go index 1fe1ef6312..67335353c0 100644 --- a/internal/cli/hooks_view.go +++ b/internal/frontend/cli/hooks_view.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/hook" + "reasonix/internal/ext/hook" ) func renderHooks(width int, hooks []hook.ResolvedHook) string { diff --git a/internal/cli/latex.go b/internal/frontend/cli/latex.go similarity index 100% rename from internal/cli/latex.go rename to internal/frontend/cli/latex.go diff --git a/internal/cli/latex_test.go b/internal/frontend/cli/latex_test.go similarity index 100% rename from internal/cli/latex_test.go rename to internal/frontend/cli/latex_test.go diff --git a/internal/cli/machine_identity_test.go b/internal/frontend/cli/machine_identity_test.go similarity index 99% rename from internal/cli/machine_identity_test.go rename to internal/frontend/cli/machine_identity_test.go index 980b6887ee..199593830b 100644 --- a/internal/cli/machine_identity_test.go +++ b/internal/frontend/cli/machine_identity_test.go @@ -10,7 +10,7 @@ import ( "sync" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func installMachineTestIdentity(t *testing.T) []byte { diff --git a/internal/cli/main_test.go b/internal/frontend/cli/main_test.go similarity index 90% rename from internal/cli/main_test.go rename to internal/frontend/cli/main_test.go index dddb4e848a..05a3a94acb 100644 --- a/internal/cli/main_test.go +++ b/internal/frontend/cli/main_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "reasonix/internal/i18n" - "reasonix/internal/testenv" + "reasonix/internal/base/i18n" + "reasonix/internal/base/testenv" ) func TestMain(m *testing.M) { diff --git a/internal/cli/mathnode.go b/internal/frontend/cli/mathnode.go similarity index 100% rename from internal/cli/mathnode.go rename to internal/frontend/cli/mathnode.go diff --git a/internal/cli/mcp.go b/internal/frontend/cli/mcp.go similarity index 98% rename from internal/cli/mcp.go rename to internal/frontend/cli/mcp.go index 70907eb7ad..5232498fe6 100644 --- a/internal/cli/mcp.go +++ b/internal/frontend/cli/mcp.go @@ -11,14 +11,14 @@ import ( "strconv" "strings" - "reasonix/internal/config" - "reasonix/internal/mcpregistry" - "reasonix/internal/mcpsetup" + "reasonix/internal/contract/config" + "reasonix/internal/ext/mcpregistry" + "reasonix/internal/ext/mcpsetup" ) // mcp.go is the `reasonix mcp` subcommand (config-only; takes effect next // session) plus the in-chat /mcp verbs (which hot-connect via the controller). -// The grammar itself lives in internal/mcpsetup, shared with the frontends that +// The grammar itself lives in internal/ext/mcpsetup, shared with the frontends that // take the same server description as a pasted block. func parseMCPAdd(args []string) (config.PluginEntry, error) { return mcpsetup.ParseArgs(args) } diff --git a/internal/cli/mcp_manager.go b/internal/frontend/cli/mcp_manager.go similarity index 100% rename from internal/cli/mcp_manager.go rename to internal/frontend/cli/mcp_manager.go diff --git a/internal/cli/mcp_manager_actions.go b/internal/frontend/cli/mcp_manager_actions.go similarity index 100% rename from internal/cli/mcp_manager_actions.go rename to internal/frontend/cli/mcp_manager_actions.go diff --git a/internal/cli/mcp_oauth.go b/internal/frontend/cli/mcp_oauth.go similarity index 94% rename from internal/cli/mcp_oauth.go rename to internal/frontend/cli/mcp_oauth.go index 3376f8d81c..9f0ff5f8a4 100644 --- a/internal/cli/mcp_oauth.go +++ b/internal/frontend/cli/mcp_oauth.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/mcpdiag" - "reasonix/internal/netclient" - "reasonix/internal/plugin" - "reasonix/internal/pluginspec" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/ext/mcpdiag" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/pluginspec" ) var mcpAuthorizeForCLI = plugin.AuthorizeHTTPMCP diff --git a/internal/cli/mcp_oauth_test.go b/internal/frontend/cli/mcp_oauth_test.go similarity index 96% rename from internal/cli/mcp_oauth_test.go rename to internal/frontend/cli/mcp_oauth_test.go index 3c95c9f205..103a93b781 100644 --- a/internal/cli/mcp_oauth_test.go +++ b/internal/frontend/cli/mcp_oauth_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/plugin" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" ) func TestMCPAuthCLIUsesReasonixPrivateState(t *testing.T) { diff --git a/internal/cli/mcp_remove_helpers.go b/internal/frontend/cli/mcp_remove_helpers.go similarity index 85% rename from internal/cli/mcp_remove_helpers.go rename to internal/frontend/cli/mcp_remove_helpers.go index 86be116436..aa943bda45 100644 --- a/internal/cli/mcp_remove_helpers.go +++ b/internal/frontend/cli/mcp_remove_helpers.go @@ -1,9 +1,9 @@ package cli import ( - "reasonix/internal/config" - "reasonix/internal/mcpdiag" - "reasonix/internal/plugin" + "reasonix/internal/contract/config" + "reasonix/internal/ext/mcpdiag" + "reasonix/internal/ext/plugin" ) func reconcileRemovedMCPOAuth(workspace, name string) error { diff --git a/internal/cli/mcp_remove_test.go b/internal/frontend/cli/mcp_remove_test.go similarity index 92% rename from internal/cli/mcp_remove_test.go rename to internal/frontend/cli/mcp_remove_test.go index d22441d135..3cfaeb4407 100644 --- a/internal/cli/mcp_remove_test.go +++ b/internal/frontend/cli/mcp_remove_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/plugin" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" ) func TestMCPRemoveCLIClearsReasonixOAuthState(t *testing.T) { diff --git a/internal/cli/mcp_view.go b/internal/frontend/cli/mcp_view.go similarity index 99% rename from internal/cli/mcp_view.go rename to internal/frontend/cli/mcp_view.go index 163b65c6fa..4bef71a465 100644 --- a/internal/cli/mcp_view.go +++ b/internal/frontend/cli/mcp_view.go @@ -5,8 +5,8 @@ import ( "slices" "strings" - "reasonix/internal/plugin" - "reasonix/internal/textutil" + "reasonix/internal/base/textutil" + "reasonix/internal/ext/plugin" ) const mcpMaxItemsPerSection = 6 diff --git a/internal/cli/md.go b/internal/frontend/cli/md.go similarity index 100% rename from internal/cli/md.go rename to internal/frontend/cli/md.go diff --git a/internal/cli/md_cjk_test.go b/internal/frontend/cli/md_cjk_test.go similarity index 100% rename from internal/cli/md_cjk_test.go rename to internal/frontend/cli/md_cjk_test.go diff --git a/internal/cli/md_test.go b/internal/frontend/cli/md_test.go similarity index 100% rename from internal/cli/md_test.go rename to internal/frontend/cli/md_test.go diff --git a/internal/cli/memory_view.go b/internal/frontend/cli/memory_view.go similarity index 71% rename from internal/cli/memory_view.go rename to internal/frontend/cli/memory_view.go index ce5f3eeba7..8d265e5c8c 100644 --- a/internal/cli/memory_view.go +++ b/internal/frontend/cli/memory_view.go @@ -3,8 +3,8 @@ package cli import ( "time" - "reasonix/internal/control" - "reasonix/internal/memory" + "reasonix/internal/session/control" + "reasonix/internal/state/memory" ) func renderMemory(width int, set *memory.Set) string { diff --git a/internal/cli/model.go b/internal/frontend/cli/model.go similarity index 91% rename from internal/cli/model.go rename to internal/frontend/cli/model.go index 7b32440b77..845a677473 100644 --- a/internal/cli/model.go +++ b/internal/frontend/cli/model.go @@ -1,7 +1,7 @@ package cli import ( - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // modelRefs returns the configured provider/model refs for slash completion. diff --git a/internal/cli/model_view.go b/internal/frontend/cli/model_view.go similarity index 94% rename from internal/cli/model_view.go rename to internal/frontend/cli/model_view.go index 0d6f2f15d0..8d6529e693 100644 --- a/internal/cli/model_view.go +++ b/internal/frontend/cli/model_view.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" ) func renderModels(width int, refs []string, active string) string { diff --git a/internal/cli/notifications.go b/internal/frontend/cli/notifications.go similarity index 80% rename from internal/cli/notifications.go rename to internal/frontend/cli/notifications.go index d39752bc47..dd917495d7 100644 --- a/internal/cli/notifications.go +++ b/internal/frontend/cli/notifications.go @@ -1,10 +1,10 @@ package cli import ( - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/notify" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/platform/notify" ) var newNotificationSender = func() notify.Sender { return notify.NewPlatformSender() } diff --git a/internal/cli/output_style_view.go b/internal/frontend/cli/output_style_view.go similarity index 95% rename from internal/cli/output_style_view.go rename to internal/frontend/cli/output_style_view.go index d7fe38547f..b0e84ef12f 100644 --- a/internal/cli/output_style_view.go +++ b/internal/frontend/cli/output_style_view.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/outputstyle" + "reasonix/internal/runtime/outputstyle" ) func renderOutputStyles(width int, styles []outputstyle.OutputStyle, active string) string { diff --git a/internal/cli/plugin.go b/internal/frontend/cli/plugin.go similarity index 98% rename from internal/cli/plugin.go rename to internal/frontend/cli/plugin.go index 7f50b42073..7b68817f13 100644 --- a/internal/cli/plugin.go +++ b/internal/frontend/cli/plugin.go @@ -10,10 +10,10 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" - "reasonix/internal/hook" - "reasonix/internal/installsource" - "reasonix/internal/pluginpkg" + "reasonix/internal/contract/config" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/installsource" + "reasonix/internal/ext/pluginpkg" ) func pluginCommand(args []string) int { diff --git a/internal/cli/plugin_slash_test.go b/internal/frontend/cli/plugin_slash_test.go similarity index 100% rename from internal/cli/plugin_slash_test.go rename to internal/frontend/cli/plugin_slash_test.go diff --git a/internal/cli/plugin_test.go b/internal/frontend/cli/plugin_test.go similarity index 95% rename from internal/cli/plugin_test.go rename to internal/frontend/cli/plugin_test.go index 42c7b3577f..3fa624da4f 100644 --- a/internal/cli/plugin_test.go +++ b/internal/frontend/cli/plugin_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) func TestPluginInstallReturnsFailureExitForFailedJSON(t *testing.T) { diff --git a/internal/cli/plugin_v1_test.go b/internal/frontend/cli/plugin_v1_test.go similarity index 98% rename from internal/cli/plugin_v1_test.go rename to internal/frontend/cli/plugin_v1_test.go index 94937df2dd..3a5cb3118f 100644 --- a/internal/cli/plugin_v1_test.go +++ b/internal/frontend/cli/plugin_v1_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/pluginpkg" ) // installV2RuntimePlugin writes a Manifest v2 package with a runtime into diff --git a/internal/cli/provider_context_window.go b/internal/frontend/cli/provider_context_window.go similarity index 96% rename from internal/cli/provider_context_window.go rename to internal/frontend/cli/provider_context_window.go index b9d3c95250..d00ae6aec9 100644 --- a/internal/cli/provider_context_window.go +++ b/internal/frontend/cli/provider_context_window.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" ) // defaultCustomContextWindow is the fallback for a relay whose window we cannot diff --git a/internal/cli/provider_wizard.go b/internal/frontend/cli/provider_wizard.go similarity index 99% rename from internal/cli/provider_wizard.go rename to internal/frontend/cli/provider_wizard.go index d256fd75cd..48a13159a3 100644 --- a/internal/cli/provider_wizard.go +++ b/internal/frontend/cli/provider_wizard.go @@ -9,8 +9,8 @@ import ( "os" "time" - "reasonix/internal/config" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" ) // protocolMenuText names a wire for a person. A kind the translators have not diff --git a/internal/cli/quick_picker.go b/internal/frontend/cli/quick_picker.go similarity index 100% rename from internal/cli/quick_picker.go rename to internal/frontend/cli/quick_picker.go diff --git a/internal/cli/reasoning_language.go b/internal/frontend/cli/reasoning_language.go similarity index 100% rename from internal/cli/reasoning_language.go rename to internal/frontend/cli/reasoning_language.go diff --git a/internal/cli/recovery_gc.go b/internal/frontend/cli/recovery_gc.go similarity index 94% rename from internal/cli/recovery_gc.go rename to internal/frontend/cli/recovery_gc.go index ede9cd9c4a..c5bb1f0b97 100644 --- a/internal/cli/recovery_gc.go +++ b/internal/frontend/cli/recovery_gc.go @@ -3,7 +3,7 @@ package cli import ( "time" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // reclaimCLIRecoveryBranches performs the same conservative recovery-copy diff --git a/internal/cli/recovery_machine_test.go b/internal/frontend/cli/recovery_machine_test.go similarity index 93% rename from internal/cli/recovery_machine_test.go rename to internal/frontend/cli/recovery_machine_test.go index 20ce302968..34cb560d00 100644 --- a/internal/cli/recovery_machine_test.go +++ b/internal/frontend/cli/recovery_machine_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/recovery" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/recovery" ) func TestSessionMachineRecoveryIsContentFree(t *testing.T) { diff --git a/internal/cli/remote.go b/internal/frontend/cli/remote.go similarity index 98% rename from internal/cli/remote.go rename to internal/frontend/cli/remote.go index 81d6b29fd9..17791f5a8e 100644 --- a/internal/cli/remote.go +++ b/internal/frontend/cli/remote.go @@ -9,10 +9,10 @@ import ( "text/tabwriter" "time" - "reasonix/internal/config" - "reasonix/internal/i18n" - "reasonix/internal/remote" - "reasonix/internal/remote/bootstrap" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/bootstrap" ) // remoteCommand dispatches `reasonix remote `, mirroring mcpCommand. diff --git a/internal/cli/remote_broker.go b/internal/frontend/cli/remote_broker.go similarity index 84% rename from internal/cli/remote_broker.go rename to internal/frontend/cli/remote_broker.go index cfdc2dbc31..a7fed16a1e 100644 --- a/internal/cli/remote_broker.go +++ b/internal/frontend/cli/remote_broker.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/providerbroker" - "reasonix/internal/remote" - "reasonix/internal/remote/bootstrap" - "reasonix/internal/remote/forward" + "reasonix/internal/assembly/boot" + "reasonix/internal/contract/config" + "reasonix/internal/model/providerbroker" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/bootstrap" + "reasonix/internal/platform/remote/forward" ) // publishBroker publishes this process's provider broker on the host's diff --git a/internal/cli/remote_cmd_test.go b/internal/frontend/cli/remote_cmd_test.go similarity index 99% rename from internal/cli/remote_cmd_test.go rename to internal/frontend/cli/remote_cmd_test.go index c6b7024a38..edb931770c 100644 --- a/internal/cli/remote_cmd_test.go +++ b/internal/frontend/cli/remote_cmd_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func TestRemoteCommandUsageExit(t *testing.T) { diff --git a/internal/cli/remote_connect.go b/internal/frontend/cli/remote_connect.go similarity index 98% rename from internal/cli/remote_connect.go rename to internal/frontend/cli/remote_connect.go index ddace332b7..51bdda8ffe 100644 --- a/internal/cli/remote_connect.go +++ b/internal/frontend/cli/remote_connect.go @@ -17,14 +17,14 @@ import ( "golang.org/x/term" - "reasonix/internal/config" - "reasonix/internal/i18n" - "reasonix/internal/netclient" - "reasonix/internal/releaseasset" - "reasonix/internal/remote" - "reasonix/internal/remote/attach" - "reasonix/internal/remote/bootstrap" - "reasonix/internal/remote/forward" + "reasonix/internal/base/i18n" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/platform/releaseasset" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/attach" + "reasonix/internal/platform/remote/bootstrap" + "reasonix/internal/platform/remote/forward" ) func newFlagSet(name string) *flag.FlagSet { diff --git a/internal/cli/remote_serve_url.go b/internal/frontend/cli/remote_serve_url.go similarity index 100% rename from internal/cli/remote_serve_url.go rename to internal/frontend/cli/remote_serve_url.go diff --git a/internal/cli/remote_serve_url_test.go b/internal/frontend/cli/remote_serve_url_test.go similarity index 93% rename from internal/cli/remote_serve_url_test.go rename to internal/frontend/cli/remote_serve_url_test.go index 273bd5e41f..3417b9af11 100644 --- a/internal/cli/remote_serve_url_test.go +++ b/internal/frontend/cli/remote_serve_url_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/serve" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/frontend/serve" + "reasonix/internal/session/control" ) func TestRemoteServeBrowserURLUsesFragmentForCurrentServe(t *testing.T) { diff --git a/internal/cli/rename_test.go b/internal/frontend/cli/rename_test.go similarity index 97% rename from internal/cli/rename_test.go rename to internal/frontend/cli/rename_test.go index ed35d77b8f..508e831a1d 100644 --- a/internal/cli/rename_test.go +++ b/internal/frontend/cli/rename_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/agent" ) func TestRenameSessionUpdatesCustomTitle(t *testing.T) { diff --git a/internal/cli/render_edge_test.go b/internal/frontend/cli/render_edge_test.go similarity index 98% rename from internal/cli/render_edge_test.go rename to internal/frontend/cli/render_edge_test.go index b5468eccd2..33ec6f0157 100644 --- a/internal/cli/render_edge_test.go +++ b/internal/frontend/cli/render_edge_test.go @@ -8,7 +8,7 @@ import ( "github.com/charmbracelet/x/ansi" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // TestDiffTabExpansion proves tab-indented code (Go) renders with no literal tabs diff --git a/internal/cli/report.go b/internal/frontend/cli/report.go similarity index 97% rename from internal/cli/report.go rename to internal/frontend/cli/report.go index 31bea3c671..a3fdebe9b6 100644 --- a/internal/cli/report.go +++ b/internal/frontend/cli/report.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/crashreport" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/platform/crashreport" ) var sendCLIReport = crashreport.Send diff --git a/internal/cli/report_test.go b/internal/frontend/cli/report_test.go similarity index 97% rename from internal/cli/report_test.go rename to internal/frontend/cli/report_test.go index 8c94f3b55e..62f44fa3a2 100644 --- a/internal/cli/report_test.go +++ b/internal/frontend/cli/report_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/crashreport" - "reasonix/internal/i18n" - "reasonix/internal/netclient" - "reasonix/internal/testenv" + "reasonix/internal/base/i18n" + "reasonix/internal/base/netclient" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/crashreport" ) func isolateCLIReports(t *testing.T) string { diff --git a/internal/cli/resume.go b/internal/frontend/cli/resume.go similarity index 93% rename from internal/cli/resume.go rename to internal/frontend/cli/resume.go index 8bd61ec1ce..ce10b50ac5 100644 --- a/internal/cli/resume.go +++ b/internal/frontend/cli/resume.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/runtime/agent" ) // mostRecentSession returns the chronologically newest saved session for diff --git a/internal/cli/resume_picker.go b/internal/frontend/cli/resume_picker.go similarity index 94% rename from internal/cli/resume_picker.go rename to internal/frontend/cli/resume_picker.go index b85425a169..3e3b2e070c 100644 --- a/internal/cli/resume_picker.go +++ b/internal/frontend/cli/resume_picker.go @@ -5,7 +5,7 @@ import ( "github.com/charmbracelet/x/ansi" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // sessionPickerLabel is the "N turns · display title" line, truncated to fit. diff --git a/internal/cli/retry_indicator_test.go b/internal/frontend/cli/retry_indicator_test.go similarity index 95% rename from internal/cli/retry_indicator_test.go rename to internal/frontend/cli/retry_indicator_test.go index 81e82fd30f..537eb3a95e 100644 --- a/internal/cli/retry_indicator_test.go +++ b/internal/frontend/cli/retry_indicator_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" ) // TestRetryIndicatorText guards the composer's retry line wording — the same diff --git a/internal/cli/review.go b/internal/frontend/cli/review.go similarity index 96% rename from internal/cli/review.go rename to internal/frontend/cli/review.go index 7fe18afb03..1ecd5b08ae 100644 --- a/internal/cli/review.go +++ b/internal/frontend/cli/review.go @@ -7,14 +7,14 @@ import ( "os" "strings" - "reasonix/internal/agent" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/sandbox" - "reasonix/internal/skill" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/assembly/boot" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/sandbox" + "reasonix/internal/tools/builtin" ) func reviewCommand(args []string) int { diff --git a/internal/cli/review_test.go b/internal/frontend/cli/review_test.go similarity index 97% rename from internal/cli/review_test.go rename to internal/frontend/cli/review_test.go index 27757a3752..d0f0d13455 100644 --- a/internal/cli/review_test.go +++ b/internal/frontend/cli/review_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" ) func TestBuildReviewTask(t *testing.T) { diff --git a/internal/cli/run_completion.go b/internal/frontend/cli/run_completion.go similarity index 96% rename from internal/cli/run_completion.go rename to internal/frontend/cli/run_completion.go index a7ceaa5c05..7d29d968fa 100644 --- a/internal/cli/run_completion.go +++ b/internal/frontend/cli/run_completion.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "reasonix/internal/agent" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/runtime/agent" ) // reportRunFailure states why a run ended without a result. Text output — which diff --git a/internal/cli/run_completion_test.go b/internal/frontend/cli/run_completion_test.go similarity index 96% rename from internal/cli/run_completion_test.go rename to internal/frontend/cli/run_completion_test.go index 5ede72f777..aa21eec081 100644 --- a/internal/cli/run_completion_test.go +++ b/internal/frontend/cli/run_completion_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) func TestClassifyRunCompletionNamesTheFailureClass(t *testing.T) { diff --git a/internal/cli/run_failure_report_test.go b/internal/frontend/cli/run_failure_report_test.go similarity index 100% rename from internal/cli/run_failure_report_test.go rename to internal/frontend/cli/run_failure_report_test.go diff --git a/internal/cli/run_graph_metrics.go b/internal/frontend/cli/run_graph_metrics.go similarity index 98% rename from internal/cli/run_graph_metrics.go rename to internal/frontend/cli/run_graph_metrics.go index 789ba78995..100306c32b 100644 --- a/internal/cli/run_graph_metrics.go +++ b/internal/frontend/cli/run_graph_metrics.go @@ -1,6 +1,6 @@ package cli -import "reasonix/internal/agentgraph" +import "reasonix/internal/contract/agentgraph" // FanoutMetrics prices what a run's fan-outs bought. It is folded from the run // graph the kernel publishes, because the timestamps carried there are the only diff --git a/internal/cli/run_graph_metrics_test.go b/internal/frontend/cli/run_graph_metrics_test.go similarity index 98% rename from internal/cli/run_graph_metrics_test.go rename to internal/frontend/cli/run_graph_metrics_test.go index c907440cc0..774859f578 100644 --- a/internal/cli/run_graph_metrics_test.go +++ b/internal/frontend/cli/run_graph_metrics_test.go @@ -3,8 +3,8 @@ package cli import ( "testing" - "reasonix/internal/agentgraph" - "reasonix/internal/event" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" ) func graphEvent(nodes []agentgraph.Node, edges []agentgraph.Edge) event.Event { diff --git a/internal/cli/run_metrics.go b/internal/frontend/cli/run_metrics.go similarity index 99% rename from internal/cli/run_metrics.go rename to internal/frontend/cli/run_metrics.go index c5c92ad6d2..3e2a171e7f 100644 --- a/internal/cli/run_metrics.go +++ b/internal/frontend/cli/run_metrics.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/model/billing" + "reasonix/internal/runtime/evidence" ) // SourceUsage is one Usage origin's share of a run. Steps counts every billed diff --git a/internal/cli/run_metrics_cost.go b/internal/frontend/cli/run_metrics_cost.go similarity index 99% rename from internal/cli/run_metrics_cost.go rename to internal/frontend/cli/run_metrics_cost.go index 65c6e24ad7..d0cb1d9acf 100644 --- a/internal/cli/run_metrics_cost.go +++ b/internal/frontend/cli/run_metrics_cost.go @@ -5,7 +5,7 @@ package cli import ( "encoding/json" - "reasonix/internal/billing" + "reasonix/internal/model/billing" ) // costAudit is the run's quotes with the price book lifted out of them. Every diff --git a/internal/cli/run_metrics_cost_test.go b/internal/frontend/cli/run_metrics_cost_test.go similarity index 99% rename from internal/cli/run_metrics_cost_test.go rename to internal/frontend/cli/run_metrics_cost_test.go index decbede40f..560f9f9ca0 100644 --- a/internal/cli/run_metrics_cost_test.go +++ b/internal/frontend/cli/run_metrics_cost_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "reasonix/internal/billing" + "reasonix/internal/model/billing" ) func money(amount, currency string) billing.Money { diff --git a/internal/cli/run_metrics_partial_test.go b/internal/frontend/cli/run_metrics_partial_test.go similarity index 98% rename from internal/cli/run_metrics_partial_test.go rename to internal/frontend/cli/run_metrics_partial_test.go index fe1e84c1be..0e80d32321 100644 --- a/internal/cli/run_metrics_partial_test.go +++ b/internal/frontend/cli/run_metrics_partial_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) func usageEvent(source string, prompt, completion int) event.Event { diff --git a/internal/cli/run_metrics_test.go b/internal/frontend/cli/run_metrics_test.go similarity index 98% rename from internal/cli/run_metrics_test.go rename to internal/frontend/cli/run_metrics_test.go index 6026a45725..b0f9bd57fe 100644 --- a/internal/cli/run_metrics_test.go +++ b/internal/frontend/cli/run_metrics_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) func TestMetricsSinkForwardsEachEventOnce(t *testing.T) { diff --git a/internal/cli/run_output.go b/internal/frontend/cli/run_output.go similarity index 99% rename from internal/cli/run_output.go rename to internal/frontend/cli/run_output.go index 9a481ab856..40b0ac17e5 100644 --- a/internal/cli/run_output.go +++ b/internal/frontend/cli/run_output.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/eventwire" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/model/billing" ) type runOutputFormat string diff --git a/internal/cli/run_output_test.go b/internal/frontend/cli/run_output_test.go similarity index 99% rename from internal/cli/run_output_test.go rename to internal/frontend/cli/run_output_test.go index 75092066c3..d3a1949496 100644 --- a/internal/cli/run_output_test.go +++ b/internal/frontend/cli/run_output_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) func TestRunOutputTextPrintsOnlyFinalMessage(t *testing.T) { diff --git a/internal/cli/run_sink.go b/internal/frontend/cli/run_sink.go similarity index 92% rename from internal/cli/run_sink.go rename to internal/frontend/cli/run_sink.go index 8d9486a2ff..0c325f21fb 100644 --- a/internal/cli/run_sink.go +++ b/internal/frontend/cli/run_sink.go @@ -6,12 +6,12 @@ import ( "golang.org/x/term" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/telemetry" - "reasonix/internal/trajectory" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/platform/telemetry" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" + "reasonix/internal/state/trajectory" ) // runSinkChain is the assembled event pipeline for one `run` invocation, with diff --git a/internal/cli/scroll_state.go b/internal/frontend/cli/scroll_state.go similarity index 100% rename from internal/cli/scroll_state.go rename to internal/frontend/cli/scroll_state.go diff --git a/internal/cli/select.go b/internal/frontend/cli/select.go similarity index 99% rename from internal/cli/select.go rename to internal/frontend/cli/select.go index 58f944f410..977b5c6f89 100644 --- a/internal/cli/select.go +++ b/internal/frontend/cli/select.go @@ -8,7 +8,7 @@ import ( "golang.org/x/term" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" ) // errCancelled is returned by selectOne when the user aborts (q or Ctrl-C). diff --git a/internal/cli/select_test.go b/internal/frontend/cli/select_test.go similarity index 100% rename from internal/cli/select_test.go rename to internal/frontend/cli/select_test.go diff --git a/internal/cli/serve_broker.go b/internal/frontend/cli/serve_broker.go similarity index 98% rename from internal/cli/serve_broker.go rename to internal/frontend/cli/serve_broker.go index 197ac5fc8e..d1019a5956 100644 --- a/internal/cli/serve_broker.go +++ b/internal/frontend/cli/serve_broker.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "reasonix/internal/provider" - "reasonix/internal/providerbroker" + "reasonix/internal/contract/provider" + "reasonix/internal/model/providerbroker" ) // brokerFlags are what a bootstrapped serve is told about the machine holding diff --git a/internal/cli/serve_broker_test.go b/internal/frontend/cli/serve_broker_test.go similarity index 98% rename from internal/cli/serve_broker_test.go rename to internal/frontend/cli/serve_broker_test.go index 0215bee31b..910e5dc4f5 100644 --- a/internal/cli/serve_broker_test.go +++ b/internal/frontend/cli/serve_broker_test.go @@ -12,8 +12,8 @@ import ( "sync/atomic" "testing" - "reasonix/internal/provider" - "reasonix/internal/providerbroker" + "reasonix/internal/contract/provider" + "reasonix/internal/model/providerbroker" ) func brokerFlagsFor(t *testing.T, args ...string) brokerFlags { diff --git a/internal/cli/serve_files.go b/internal/frontend/cli/serve_files.go similarity index 96% rename from internal/cli/serve_files.go rename to internal/frontend/cli/serve_files.go index 13759e0d3a..13007b3234 100644 --- a/internal/cli/serve_files.go +++ b/internal/frontend/cli/serve_files.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "reasonix/internal/fileutil" - "reasonix/internal/i18n" - "reasonix/internal/serve" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/i18n" + "reasonix/internal/frontend/serve" ) // readServeTokenFile loads the auth=token pre-shared token from a file so the diff --git a/internal/cli/serve_files_test.go b/internal/frontend/cli/serve_files_test.go similarity index 98% rename from internal/cli/serve_files_test.go rename to internal/frontend/cli/serve_files_test.go index 474f746dc4..026408db40 100644 --- a/internal/cli/serve_files_test.go +++ b/internal/frontend/cli/serve_files_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestReadServeTokenFileTrimsSingleLine(t *testing.T) { diff --git a/internal/cli/serve_frontend.go b/internal/frontend/cli/serve_frontend.go similarity index 98% rename from internal/cli/serve_frontend.go rename to internal/frontend/cli/serve_frontend.go index e197f735bc..c7781d461d 100644 --- a/internal/cli/serve_frontend.go +++ b/internal/frontend/cli/serve_frontend.go @@ -14,14 +14,14 @@ import ( "strings" "syscall" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/serve" - "reasonix/internal/surface" - "reasonix/internal/telemetry" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/surface" + "reasonix/internal/frontend/serve" + "reasonix/internal/platform/telemetry" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // serveHost is what the frontend loop needs from whatever is serving: a single diff --git a/internal/cli/serve_provider_setup_test.go b/internal/frontend/cli/serve_provider_setup_test.go similarity index 99% rename from internal/cli/serve_provider_setup_test.go rename to internal/frontend/cli/serve_provider_setup_test.go index 78601a9452..f47563a70d 100644 --- a/internal/cli/serve_provider_setup_test.go +++ b/internal/frontend/cli/serve_provider_setup_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) const serveMissingKeyHelperEnv = "REASONIX_TEST_SERVE_MISSING_KEY_HELPER" diff --git a/internal/cli/session_lease.go b/internal/frontend/cli/session_lease.go similarity index 97% rename from internal/cli/session_lease.go rename to internal/frontend/cli/session_lease.go index 6efe09a9f9..ed66f2d2a5 100644 --- a/internal/cli/session_lease.go +++ b/internal/frontend/cli/session_lease.go @@ -6,9 +6,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // sessionLeaseResumeRefusal is the startup-time refusal for `reasonix diff --git a/internal/cli/session_machine.go b/internal/frontend/cli/session_machine.go similarity index 98% rename from internal/cli/session_machine.go rename to internal/frontend/cli/session_machine.go index 4bc5dbfcff..fe070f6493 100644 --- a/internal/cli/session_machine.go +++ b/internal/frontend/cli/session_machine.go @@ -15,12 +15,12 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/filelock" - "reasonix/internal/fileutil" - "reasonix/internal/recovery" - "reasonix/internal/store" + "reasonix/internal/base/filelock" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/recovery" + "reasonix/internal/state/store" ) const ( diff --git a/internal/cli/session_machine_test.go b/internal/frontend/cli/session_machine_test.go similarity index 97% rename from internal/cli/session_machine_test.go rename to internal/frontend/cli/session_machine_test.go index 4c553e2db4..534f7674d7 100644 --- a/internal/cli/session_machine_test.go +++ b/internal/frontend/cli/session_machine_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func TestSessionMachineListIsStableAndRedacted(t *testing.T) { diff --git a/internal/cli/setup_manager.go b/internal/frontend/cli/setup_manager.go similarity index 99% rename from internal/cli/setup_manager.go rename to internal/frontend/cli/setup_manager.go index c02589b450..110b8c76b6 100644 --- a/internal/cli/setup_manager.go +++ b/internal/frontend/cli/setup_manager.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" ) type providerSetupSession struct { diff --git a/internal/cli/setup_manager_test.go b/internal/frontend/cli/setup_manager_test.go similarity index 99% rename from internal/cli/setup_manager_test.go rename to internal/frontend/cli/setup_manager_test.go index dca9a4daf9..1dc01bbe6a 100644 --- a/internal/cli/setup_manager_test.go +++ b/internal/frontend/cli/setup_manager_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func setupTestConfig() *config.Config { diff --git a/internal/cli/shell_completion.go b/internal/frontend/cli/shell_completion.go similarity index 99% rename from internal/cli/shell_completion.go rename to internal/frontend/cli/shell_completion.go index 307c5b0338..bbe0408e10 100644 --- a/internal/cli/shell_completion.go +++ b/internal/frontend/cli/shell_completion.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) type cliCompletionValueKind uint8 diff --git a/internal/cli/shell_completion_test.go b/internal/frontend/cli/shell_completion_test.go similarity index 100% rename from internal/cli/shell_completion_test.go rename to internal/frontend/cli/shell_completion_test.go diff --git a/internal/cli/skill_picker.go b/internal/frontend/cli/skill_picker.go similarity index 100% rename from internal/cli/skill_picker.go rename to internal/frontend/cli/skill_picker.go diff --git a/internal/cli/skill_picker_view.go b/internal/frontend/cli/skill_picker_view.go similarity index 100% rename from internal/cli/skill_picker_view.go rename to internal/frontend/cli/skill_picker_view.go diff --git a/internal/cli/skill_view.go b/internal/frontend/cli/skill_view.go similarity index 98% rename from internal/cli/skill_view.go rename to internal/frontend/cli/skill_view.go index 41ba0a49b6..041c0c71df 100644 --- a/internal/cli/skill_view.go +++ b/internal/frontend/cli/skill_view.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/skill" + "reasonix/internal/ext/skill" ) const skillShowMaxLines = 80 diff --git a/internal/cli/slash_registry.go b/internal/frontend/cli/slash_registry.go similarity index 99% rename from internal/cli/slash_registry.go rename to internal/frontend/cli/slash_registry.go index 1d36a44c7e..c02b3a438a 100644 --- a/internal/cli/slash_registry.go +++ b/internal/frontend/cli/slash_registry.go @@ -4,7 +4,7 @@ import ( "slices" "strings" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" ) // builtinSlashSpec is the single source of truth for a built-in command's diff --git a/internal/cli/slash_registry_test.go b/internal/frontend/cli/slash_registry_test.go similarity index 100% rename from internal/cli/slash_registry_test.go rename to internal/frontend/cli/slash_registry_test.go diff --git a/internal/cli/style.go b/internal/frontend/cli/style.go similarity index 100% rename from internal/cli/style.go rename to internal/frontend/cli/style.go diff --git a/internal/cli/style_profile_test.go b/internal/frontend/cli/style_profile_test.go similarity index 100% rename from internal/cli/style_profile_test.go rename to internal/frontend/cli/style_profile_test.go diff --git a/internal/cli/subagent.go b/internal/frontend/cli/subagent.go similarity index 98% rename from internal/cli/subagent.go rename to internal/frontend/cli/subagent.go index 0fde9aa185..5c07a049cb 100644 --- a/internal/cli/subagent.go +++ b/internal/frontend/cli/subagent.go @@ -11,12 +11,12 @@ import ( "strings" "syscall" - "reasonix/internal/boot" - "reasonix/internal/command" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/skill" + "reasonix/internal/assembly/boot" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/ext/command" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" ) var setupSubagentCommand = func(ctx context.Context, modelName string, maxStepsOverride int, requireKey bool, sink event.Sink, workspaceRoot string) (*control.Controller, error) { diff --git a/internal/cli/subagent_handoff_metrics_test.go b/internal/frontend/cli/subagent_handoff_metrics_test.go similarity index 98% rename from internal/cli/subagent_handoff_metrics_test.go rename to internal/frontend/cli/subagent_handoff_metrics_test.go index f06c48a1f8..ea2e54f435 100644 --- a/internal/cli/subagent_handoff_metrics_test.go +++ b/internal/frontend/cli/subagent_handoff_metrics_test.go @@ -3,7 +3,7 @@ package cli import ( "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // The compliance denominator is the point of this test: a child the provider diff --git a/internal/cli/subagent_test.go b/internal/frontend/cli/subagent_test.go similarity index 98% rename from internal/cli/subagent_test.go rename to internal/frontend/cli/subagent_test.go index 852643bed9..0a24b21cfe 100644 --- a/internal/cli/subagent_test.go +++ b/internal/frontend/cli/subagent_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/pluginpkg" - "reasonix/internal/skill" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" ) func TestSubagentProfileCLIManageRoundTrip(t *testing.T) { diff --git a/internal/cli/task.go b/internal/frontend/cli/task.go similarity index 99% rename from internal/cli/task.go rename to internal/frontend/cli/task.go index e4e077f8a9..17cb1847d9 100644 --- a/internal/cli/task.go +++ b/internal/frontend/cli/task.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "reasonix/internal/taskmonitor" + "reasonix/internal/runtime/taskmonitor" ) // taskStore is the taskmonitor.Store used by the task CLI commands. diff --git a/internal/cli/task_machine.go b/internal/frontend/cli/task_machine.go similarity index 99% rename from internal/cli/task_machine.go rename to internal/frontend/cli/task_machine.go index 908f4fe6d9..ea92264361 100644 --- a/internal/cli/task_machine.go +++ b/internal/frontend/cli/task_machine.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/jobs" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" ) type machineTask struct { diff --git a/internal/cli/task_machine_test.go b/internal/frontend/cli/task_machine_test.go similarity index 97% rename from internal/cli/task_machine_test.go rename to internal/frontend/cli/task_machine_test.go index 3c6a19dc7f..6efda4f45b 100644 --- a/internal/cli/task_machine_test.go +++ b/internal/frontend/cli/task_machine_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/jobs" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" ) func TestTaskMachineListUsesContentFreePersistedMetadata(t *testing.T) { diff --git a/internal/cli/task_test.go b/internal/frontend/cli/task_test.go similarity index 99% rename from internal/cli/task_test.go rename to internal/frontend/cli/task_test.go index 7d8c7cba0d..4fa7094fa3 100644 --- a/internal/cli/task_test.go +++ b/internal/frontend/cli/task_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/taskmonitor" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/taskmonitor" ) const legacySensitiveSummary = `command "deploy --token secret" failed in /Users/alice/private` diff --git a/internal/cli/theme.go b/internal/frontend/cli/theme.go similarity index 100% rename from internal/cli/theme.go rename to internal/frontend/cli/theme.go diff --git a/internal/cli/theme_osc_other.go b/internal/frontend/cli/theme_osc_other.go similarity index 100% rename from internal/cli/theme_osc_other.go rename to internal/frontend/cli/theme_osc_other.go diff --git a/internal/cli/theme_osc_unix.go b/internal/frontend/cli/theme_osc_unix.go similarity index 100% rename from internal/cli/theme_osc_unix.go rename to internal/frontend/cli/theme_osc_unix.go diff --git a/internal/cli/theme_sweep.go b/internal/frontend/cli/theme_sweep.go similarity index 100% rename from internal/cli/theme_sweep.go rename to internal/frontend/cli/theme_sweep.go diff --git a/internal/cli/theme_sweep_test.go b/internal/frontend/cli/theme_sweep_test.go similarity index 100% rename from internal/cli/theme_sweep_test.go rename to internal/frontend/cli/theme_sweep_test.go diff --git a/internal/cli/theme_test.go b/internal/frontend/cli/theme_test.go similarity index 100% rename from internal/cli/theme_test.go rename to internal/frontend/cli/theme_test.go diff --git a/internal/cli/toolcard.go b/internal/frontend/cli/toolcard.go similarity index 99% rename from internal/cli/toolcard.go rename to internal/frontend/cli/toolcard.go index 8967e625d5..53503283ae 100644 --- a/internal/cli/toolcard.go +++ b/internal/frontend/cli/toolcard.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // toolVerb maps a tool's snake_case id to the verb shown in its card. diff --git a/internal/cli/toolcard_test.go b/internal/frontend/cli/toolcard_test.go similarity index 100% rename from internal/cli/toolcard_test.go rename to internal/frontend/cli/toolcard_test.go diff --git a/internal/cli/transcript.go b/internal/frontend/cli/transcript.go similarity index 100% rename from internal/cli/transcript.go rename to internal/frontend/cli/transcript.go diff --git a/internal/cli/transcript_test.go b/internal/frontend/cli/transcript_test.go similarity index 100% rename from internal/cli/transcript_test.go rename to internal/frontend/cli/transcript_test.go diff --git a/internal/cli/tui_diagnostics.go b/internal/frontend/cli/tui_diagnostics.go similarity index 100% rename from internal/cli/tui_diagnostics.go rename to internal/frontend/cli/tui_diagnostics.go diff --git a/internal/cli/turn_failure.go b/internal/frontend/cli/turn_failure.go similarity index 100% rename from internal/cli/turn_failure.go rename to internal/frontend/cli/turn_failure.go diff --git a/internal/cli/turn_failure_test.go b/internal/frontend/cli/turn_failure_test.go similarity index 100% rename from internal/cli/turn_failure_test.go rename to internal/frontend/cli/turn_failure_test.go diff --git a/internal/cli/upgrade.go b/internal/frontend/cli/upgrade.go similarity index 99% rename from internal/cli/upgrade.go rename to internal/frontend/cli/upgrade.go index 1614152f94..a2c7fdd99b 100644 --- a/internal/cli/upgrade.go +++ b/internal/frontend/cli/upgrade.go @@ -20,13 +20,13 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/i18n" - "reasonix/internal/netclient" + "reasonix/internal/base/i18n" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" "github.com/spf13/pflag" "golang.org/x/mod/semver" - "reasonix/internal/redirectguard" + "reasonix/internal/safety/redirectguard" ) const ( diff --git a/internal/cli/upgrade_test.go b/internal/frontend/cli/upgrade_test.go similarity index 99% rename from internal/cli/upgrade_test.go rename to internal/frontend/cli/upgrade_test.go index a8fd67a331..b2d49ba628 100644 --- a/internal/cli/upgrade_test.go +++ b/internal/frontend/cli/upgrade_test.go @@ -16,9 +16,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/redirectguard" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/safety/redirectguard" ) func TestNormalizeVersion(t *testing.T) { @@ -331,7 +331,7 @@ func TestFindCLIPlatformAssetRequiresExactArchiveName(t *testing.T) { } } -// The mechanism is held by internal/redirectguard; what this holds is the +// The mechanism is held by internal/safety/redirectguard; what this holds is the // decision made here -- that these are the hosts a published CLI comes from -- // by driving the guard exactly as upgrade configures it. func TestCLIUpgradeTrustsOnlyItsReleaseHosts(t *testing.T) { diff --git a/internal/cli/upgrade_token_test.go b/internal/frontend/cli/upgrade_token_test.go similarity index 100% rename from internal/cli/upgrade_token_test.go rename to internal/frontend/cli/upgrade_token_test.go diff --git a/internal/cli/usage_catalog_lifecycle.go b/internal/frontend/cli/usage_catalog_lifecycle.go similarity index 87% rename from internal/cli/usage_catalog_lifecycle.go rename to internal/frontend/cli/usage_catalog_lifecycle.go index afc99020b9..9dc9cb6b6f 100644 --- a/internal/cli/usage_catalog_lifecycle.go +++ b/internal/frontend/cli/usage_catalog_lifecycle.go @@ -4,9 +4,9 @@ import ( "context" "time" - "reasonix/internal/config" - "reasonix/internal/history" - "reasonix/internal/stats" + "reasonix/internal/contract/config" + "reasonix/internal/state/history" + "reasonix/internal/state/stats" ) // Process-level projections, closed at the process boundary rather than with a diff --git a/internal/cli/view_helpers.go b/internal/frontend/cli/view_helpers.go similarity index 100% rename from internal/cli/view_helpers.go rename to internal/frontend/cli/view_helpers.go diff --git a/internal/cli/view_helpers_test.go b/internal/frontend/cli/view_helpers_test.go similarity index 97% rename from internal/cli/view_helpers_test.go rename to internal/frontend/cli/view_helpers_test.go index cd44975c0e..19627df081 100644 --- a/internal/cli/view_helpers_test.go +++ b/internal/frontend/cli/view_helpers_test.go @@ -5,13 +5,13 @@ import ( "strings" "testing" - "reasonix/internal/command" - "reasonix/internal/hook" - "reasonix/internal/memory" - "reasonix/internal/outputstyle" - "reasonix/internal/plugin" - "reasonix/internal/skill" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/command" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/outputstyle" + "reasonix/internal/state/memory" ) func TestRenderSkillListUsesSharedVisualLanguage(t *testing.T) { diff --git a/internal/cli/web_browser.go b/internal/frontend/cli/web_browser.go similarity index 100% rename from internal/cli/web_browser.go rename to internal/frontend/cli/web_browser.go diff --git a/internal/cli/web_process_unix.go b/internal/frontend/cli/web_process_unix.go similarity index 100% rename from internal/cli/web_process_unix.go rename to internal/frontend/cli/web_process_unix.go diff --git a/internal/cli/web_process_windows.go b/internal/frontend/cli/web_process_windows.go similarity index 100% rename from internal/cli/web_process_windows.go rename to internal/frontend/cli/web_process_windows.go diff --git a/internal/cli/web_runtime.go b/internal/frontend/cli/web_runtime.go similarity index 98% rename from internal/cli/web_runtime.go rename to internal/frontend/cli/web_runtime.go index 2257897fcf..e23962295e 100644 --- a/internal/cli/web_runtime.go +++ b/internal/frontend/cli/web_runtime.go @@ -16,9 +16,9 @@ import ( "time" "unicode/utf8" - "reasonix/internal/config" - "reasonix/internal/fileutil" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" + "reasonix/internal/state/store" ) func serveConfigWithCommandDefaults(command string, authExplicit bool, cfg config.ServeConfig) config.ServeConfig { diff --git a/internal/cli/web_runtime_test.go b/internal/frontend/cli/web_runtime_test.go similarity index 98% rename from internal/cli/web_runtime_test.go rename to internal/frontend/cli/web_runtime_test.go index cdf145620b..39f8b6e90a 100644 --- a/internal/cli/web_runtime_test.go +++ b/internal/frontend/cli/web_runtime_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func TestServeConfigWithCommandDefaults(t *testing.T) { diff --git a/internal/cli/web_test.go b/internal/frontend/cli/web_test.go similarity index 97% rename from internal/cli/web_test.go rename to internal/frontend/cli/web_test.go index e2948ec004..5eb6e68f89 100644 --- a/internal/cli/web_test.go +++ b/internal/frontend/cli/web_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/serve" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/frontend/serve" + "reasonix/internal/session/control" ) func TestRunDispatchesWebCommand(t *testing.T) { diff --git a/internal/cli/width_test.go b/internal/frontend/cli/width_test.go similarity index 100% rename from internal/cli/width_test.go rename to internal/frontend/cli/width_test.go diff --git a/internal/doctor/billing.go b/internal/frontend/doctor/billing.go similarity index 98% rename from internal/doctor/billing.go rename to internal/frontend/doctor/billing.go index 7afb09d20c..6a5224b160 100644 --- a/internal/doctor/billing.go +++ b/internal/frontend/doctor/billing.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "reasonix/internal/billing" - "reasonix/internal/config" + "reasonix/internal/contract/config" + "reasonix/internal/model/billing" ) // BillingReport is the structured output of `reasonix doctor billing`. diff --git a/internal/doctor/billing_test.go b/internal/frontend/doctor/billing_test.go similarity index 94% rename from internal/doctor/billing_test.go rename to internal/frontend/doctor/billing_test.go index ecc7c069bd..60f52bf2dc 100644 --- a/internal/doctor/billing_test.go +++ b/internal/frontend/doctor/billing_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func TestCollectBillingIncludesProvidersAndDisplay(t *testing.T) { diff --git a/internal/doctor/git_test.go b/internal/frontend/doctor/git_test.go similarity index 97% rename from internal/doctor/git_test.go rename to internal/frontend/doctor/git_test.go index a7856d368f..94210a7cac 100644 --- a/internal/doctor/git_test.go +++ b/internal/frontend/doctor/git_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // No git is a supported configuration, so the report states it as a fact and diff --git a/internal/doctor/main_test.go b/internal/frontend/doctor/main_test.go similarity index 76% rename from internal/doctor/main_test.go rename to internal/frontend/doctor/main_test.go index 08277bae3d..06e8abe183 100644 --- a/internal/doctor/main_test.go +++ b/internal/frontend/doctor/main_test.go @@ -3,7 +3,7 @@ package doctor import ( "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestMain(m *testing.M) { diff --git a/internal/doctor/quality.go b/internal/frontend/doctor/quality.go similarity index 98% rename from internal/doctor/quality.go rename to internal/frontend/doctor/quality.go index 498a99c4b3..71e4c311b7 100644 --- a/internal/doctor/quality.go +++ b/internal/frontend/doctor/quality.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/usagereport" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/usagereport" ) // isVerificationToolCall reports whether a persisted tool call is a shell diff --git a/internal/doctor/quality_test.go b/internal/frontend/doctor/quality_test.go similarity index 98% rename from internal/doctor/quality_test.go rename to internal/frontend/doctor/quality_test.go index e47c95e48f..afecac515e 100644 --- a/internal/doctor/quality_test.go +++ b/internal/frontend/doctor/quality_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/agent" ) func TestCollectQualityProducesPublicSafeSummary(t *testing.T) { diff --git a/internal/doctor/reasoning_report_test.go b/internal/frontend/doctor/reasoning_report_test.go similarity index 97% rename from internal/doctor/reasoning_report_test.go rename to internal/frontend/doctor/reasoning_report_test.go index a3c44c7054..509f9f2869 100644 --- a/internal/doctor/reasoning_report_test.go +++ b/internal/frontend/doctor/reasoning_report_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // A relay's protocol is declared or it is nothing, and an endpoint that refuses diff --git a/internal/doctor/report.go b/internal/frontend/doctor/report.go similarity index 98% rename from internal/doctor/report.go rename to internal/frontend/doctor/report.go index 61ce40bfd9..2cc7c491ad 100644 --- a/internal/doctor/report.go +++ b/internal/frontend/doctor/report.go @@ -15,14 +15,14 @@ import ( "github.com/BurntSushi/toml" - "reasonix/internal/agent" - "reasonix/internal/config" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/gitcmd" - "reasonix/internal/netclient" - "reasonix/internal/sandbox" - "reasonix/internal/skill" - "reasonix/internal/store" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/ext/skill" + "reasonix/internal/platform/gitcmd" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/store" ) type Options struct { diff --git a/internal/doctor/report_test.go b/internal/frontend/doctor/report_test.go similarity index 98% rename from internal/doctor/report_test.go rename to internal/frontend/doctor/report_test.go index 51840dcf19..c568ea0240 100644 --- a/internal/doctor/report_test.go +++ b/internal/frontend/doctor/report_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func TestRedactHome(t *testing.T) { diff --git a/internal/doctor/session_bundle.go b/internal/frontend/doctor/session_bundle.go similarity index 99% rename from internal/doctor/session_bundle.go rename to internal/frontend/doctor/session_bundle.go index 81b5f2aa96..fbe3ea9bbd 100644 --- a/internal/doctor/session_bundle.go +++ b/internal/frontend/doctor/session_bundle.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/store" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) const sessionBundleSchemaVersion = 1 diff --git a/internal/doctor/session_bundle_test.go b/internal/frontend/doctor/session_bundle_test.go similarity index 97% rename from internal/doctor/session_bundle_test.go rename to internal/frontend/doctor/session_bundle_test.go index cddc2faaa7..c35a552205 100644 --- a/internal/doctor/session_bundle_test.go +++ b/internal/frontend/doctor/session_bundle_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) func TestWriteSessionBundleIncludesRecoveryChain(t *testing.T) { diff --git a/internal/doctor/session_redact.go b/internal/frontend/doctor/session_redact.go similarity index 98% rename from internal/doctor/session_redact.go rename to internal/frontend/doctor/session_redact.go index 6eebc07cfd..b979af2d59 100644 --- a/internal/doctor/session_redact.go +++ b/internal/frontend/doctor/session_redact.go @@ -12,11 +12,11 @@ import ( "sort" "strings" - "reasonix/internal/agent" - "reasonix/internal/fileutil" - "reasonix/internal/provider" - "reasonix/internal/secrets" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) // RedactSessionsOptions controls historical session-log redaction. diff --git a/internal/doctor/session_redact_test.go b/internal/frontend/doctor/session_redact_test.go similarity index 98% rename from internal/doctor/session_redact_test.go rename to internal/frontend/doctor/session_redact_test.go index 81fa4c4934..2ff705b4ef 100644 --- a/internal/doctor/session_redact_test.go +++ b/internal/frontend/doctor/session_redact_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) func TestRedactSessionsScrubsHistoricalSessionArtifacts(t *testing.T) { diff --git a/internal/doctor/skill_health.go b/internal/frontend/doctor/skill_health.go similarity index 97% rename from internal/doctor/skill_health.go rename to internal/frontend/doctor/skill_health.go index cb2a40dd8c..01fce85757 100644 --- a/internal/doctor/skill_health.go +++ b/internal/frontend/doctor/skill_health.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "reasonix/internal/config" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" ) // SkillHealthOptions configures skill/MCP capability diagnostics for doctor. diff --git a/internal/doctor/skill_health_test.go b/internal/frontend/doctor/skill_health_test.go similarity index 95% rename from internal/doctor/skill_health_test.go rename to internal/frontend/doctor/skill_health_test.go index cd32baa959..7fdff414e6 100644 --- a/internal/doctor/skill_health_test.go +++ b/internal/frontend/doctor/skill_health_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/skill" + "reasonix/internal/contract/config" + "reasonix/internal/ext/skill" ) func TestCollectSkillHealthWarnings(t *testing.T) { diff --git a/internal/remotehost/remotehost.go b/internal/frontend/remotehost/remotehost.go similarity index 97% rename from internal/remotehost/remotehost.go rename to internal/frontend/remotehost/remotehost.go index 922e22c691..6c4510e1c7 100644 --- a/internal/remotehost/remotehost.go +++ b/internal/frontend/remotehost/remotehost.go @@ -12,15 +12,15 @@ import ( "net/http" "time" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/netclient" - "reasonix/internal/providerbroker" - "reasonix/internal/releaseasset" - "reasonix/internal/remote" - "reasonix/internal/remote/attach" - "reasonix/internal/remote/bootstrap" - "reasonix/internal/serve" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/frontend/serve" + "reasonix/internal/model/providerbroker" + "reasonix/internal/platform/releaseasset" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/attach" + "reasonix/internal/platform/remote/bootstrap" ) // Link gives the hub what it needs for panes on other machines: a pool that diff --git a/internal/serve/account.go b/internal/frontend/serve/account.go similarity index 97% rename from internal/serve/account.go rename to internal/frontend/serve/account.go index 3db9db5a7a..889ed9b345 100644 --- a/internal/serve/account.go +++ b/internal/frontend/serve/account.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "reasonix/internal/account" - "reasonix/internal/config" - "reasonix/internal/netclient" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/platform/account" ) // AllowAccountAuth grants the /account routes. Off until a host asks: signing diff --git a/internal/serve/account_test.go b/internal/frontend/serve/account_test.go similarity index 97% rename from internal/serve/account_test.go rename to internal/frontend/serve/account_test.go index 5ebeff0c37..b37d26e573 100644 --- a/internal/serve/account_test.go +++ b/internal/frontend/serve/account_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) func accountServer(t *testing.T, granted bool) *httptest.Server { diff --git a/internal/serve/adjudications.go b/internal/frontend/serve/adjudications.go similarity index 98% rename from internal/serve/adjudications.go rename to internal/frontend/serve/adjudications.go index e192c09b41..16388d576b 100644 --- a/internal/serve/adjudications.go +++ b/internal/frontend/serve/adjudications.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // The read surface for host adjudication. Its own route rather than a field on diff --git a/internal/serve/adjudications_test.go b/internal/frontend/serve/adjudications_test.go similarity index 96% rename from internal/serve/adjudications_test.go rename to internal/frontend/serve/adjudications_test.go index b7d49cdc0e..c8cfa6ce60 100644 --- a/internal/serve/adjudications_test.go +++ b/internal/frontend/serve/adjudications_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) func adjudicationServer(t *testing.T) (*httptest.Server, *control.Controller) { diff --git a/internal/serve/appearance.go b/internal/frontend/serve/appearance.go similarity index 99% rename from internal/serve/appearance.go rename to internal/frontend/serve/appearance.go index e322da6bbb..d9d24a2010 100644 --- a/internal/serve/appearance.go +++ b/internal/frontend/serve/appearance.go @@ -13,7 +13,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // maxWallpaperUpload bounds what a window will hold in memory to decode and diff --git a/internal/serve/approval_persist_test.go b/internal/frontend/serve/approval_persist_test.go similarity index 95% rename from internal/serve/approval_persist_test.go rename to internal/frontend/serve/approval_persist_test.go index e4d315261e..391154df68 100644 --- a/internal/serve/approval_persist_test.go +++ b/internal/frontend/serve/approval_persist_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // The posture chosen on the composer has to survive a relaunch, and saving it diff --git a/internal/serve/ask.go b/internal/frontend/serve/ask.go similarity index 100% rename from internal/serve/ask.go rename to internal/frontend/serve/ask.go diff --git a/internal/serve/ask_test.go b/internal/frontend/serve/ask_test.go similarity index 99% rename from internal/serve/ask_test.go rename to internal/frontend/serve/ask_test.go index 233535da91..c620a6c387 100644 --- a/internal/serve/ask_test.go +++ b/internal/frontend/serve/ask_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // blockingAttacher holds a dial open and hands its context out, which is the diff --git a/internal/serve/attachments.go b/internal/frontend/serve/attachments.go similarity index 98% rename from internal/serve/attachments.go rename to internal/frontend/serve/attachments.go index 380cbca710..caa59bc5e0 100644 --- a/internal/serve/attachments.go +++ b/internal/frontend/serve/attachments.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // Bytes ride into a turn as path references, exactly as the CLI's do. This is diff --git a/internal/serve/attachments_test.go b/internal/frontend/serve/attachments_test.go similarity index 95% rename from internal/serve/attachments_test.go rename to internal/frontend/serve/attachments_test.go index 467390b0b7..00f601b76f 100644 --- a/internal/serve/attachments_test.go +++ b/internal/frontend/serve/attachments_test.go @@ -13,9 +13,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // A browser client cannot write the attachment file itself, so this endpoint is diff --git a/internal/serve/auth.go b/internal/frontend/serve/auth.go similarity index 99% rename from internal/serve/auth.go rename to internal/frontend/serve/auth.go index b629bb814c..4be3de029f 100644 --- a/internal/serve/auth.go +++ b/internal/frontend/serve/auth.go @@ -23,7 +23,7 @@ import ( "golang.org/x/crypto/bcrypt" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) //go:embed login.html diff --git a/internal/serve/auth_fragment_test.go b/internal/frontend/serve/auth_fragment_test.go similarity index 99% rename from internal/serve/auth_fragment_test.go rename to internal/frontend/serve/auth_fragment_test.go index c3c9cdff51..acbf72855b 100644 --- a/internal/serve/auth_fragment_test.go +++ b/internal/frontend/serve/auth_fragment_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func TestTokenModeAllowsOnlyBootstrapShellWithoutAuth(t *testing.T) { diff --git a/internal/serve/auth_test.go b/internal/frontend/serve/auth_test.go similarity index 99% rename from internal/serve/auth_test.go rename to internal/frontend/serve/auth_test.go index 9d9d0d62f8..ca145fe6d1 100644 --- a/internal/serve/auth_test.go +++ b/internal/frontend/serve/auth_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func TestGenerateToken(t *testing.T) { diff --git a/internal/serve/balance.go b/internal/frontend/serve/balance.go similarity index 97% rename from internal/serve/balance.go rename to internal/frontend/serve/balance.go index 2597628c84..854cd70ca9 100644 --- a/internal/serve/balance.go +++ b/internal/frontend/serve/balance.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "reasonix/internal/billing" - "reasonix/internal/config" + "reasonix/internal/contract/config" + "reasonix/internal/model/billing" ) // walletBody is the wallet as a frontend lays it out. FetchedAt dates the diff --git a/internal/serve/balance_route_test.go b/internal/frontend/serve/balance_route_test.go similarity index 97% rename from internal/serve/balance_route_test.go rename to internal/frontend/serve/balance_route_test.go index 43c66b9498..f220aea5d6 100644 --- a/internal/serve/balance_route_test.go +++ b/internal/frontend/serve/balance_route_test.go @@ -11,10 +11,10 @@ import ( "sync/atomic" "testing" - "reasonix/internal/billing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/model/billing" + "reasonix/internal/session/control" ) const walletJSON = `{"is_available":true,"balance_infos":[{"currency":"CNY","total_balance":"10.00","granted_balance":"0","topped_up_balance":"10.00"}]}` diff --git a/internal/serve/boundary.go b/internal/frontend/serve/boundary.go similarity index 98% rename from internal/serve/boundary.go rename to internal/frontend/serve/boundary.go index 1376456232..32aadf5184 100644 --- a/internal/serve/boundary.go +++ b/internal/frontend/serve/boundary.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "reasonix/internal/control" + "reasonix/internal/session/control" ) func (s *Server) registerBoundaryRoutes(mux *http.ServeMux) { diff --git a/internal/serve/boundary_test.go b/internal/frontend/serve/boundary_test.go similarity index 98% rename from internal/serve/boundary_test.go rename to internal/frontend/serve/boundary_test.go index 52438a95a9..ee6144801d 100644 --- a/internal/serve/boundary_test.go +++ b/internal/frontend/serve/boundary_test.go @@ -7,9 +7,9 @@ import ( "runtime" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/sandbox" + "reasonix/internal/contract/config" + "reasonix/internal/safety/sandbox" + "reasonix/internal/session/control" ) func readJSON[T any](t *testing.T, base, path string) T { diff --git a/internal/serve/broadcaster.go b/internal/frontend/serve/broadcaster.go similarity index 98% rename from internal/serve/broadcaster.go rename to internal/frontend/serve/broadcaster.go index e221471575..9b8b13cbf7 100644 --- a/internal/serve/broadcaster.go +++ b/internal/frontend/serve/broadcaster.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/eventwire" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/model/billing" ) // Broadcaster is the event.Sink the controller emits to in server mode: one diff --git a/internal/serve/broadcaster_test.go b/internal/frontend/serve/broadcaster_test.go similarity index 98% rename from internal/serve/broadcaster_test.go rename to internal/frontend/serve/broadcaster_test.go index 7a97a85ef7..b5bce5a210 100644 --- a/internal/serve/broadcaster_test.go +++ b/internal/frontend/serve/broadcaster_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/eventwire" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" ) // read drains ch until want is seen or the deadline passes, the way a real SSE diff --git a/internal/serve/browser_host.go b/internal/frontend/serve/browser_host.go similarity index 99% rename from internal/serve/browser_host.go rename to internal/frontend/serve/browser_host.go index 744994fe91..bb8315a353 100644 --- a/internal/serve/browser_host.go +++ b/internal/frontend/serve/browser_host.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "reasonix/internal/browser" + "reasonix/internal/platform/browser" ) // BrowserHost relays hosted-browser connections between the kernel and the diff --git a/internal/serve/browser_host_test.go b/internal/frontend/serve/browser_host_test.go similarity index 98% rename from internal/serve/browser_host_test.go rename to internal/frontend/serve/browser_host_test.go index fdad8039d7..d58e8147db 100644 --- a/internal/serve/browser_host_test.go +++ b/internal/frontend/serve/browser_host_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "reasonix/internal/browser" + "reasonix/internal/platform/browser" ) func browserHostServer(t *testing.T) (*BrowserHost, *httptest.Server) { diff --git a/internal/serve/browser_open.go b/internal/frontend/serve/browser_open.go similarity index 100% rename from internal/serve/browser_open.go rename to internal/frontend/serve/browser_open.go diff --git a/internal/serve/browser_tabs.go b/internal/frontend/serve/browser_tabs.go similarity index 100% rename from internal/serve/browser_tabs.go rename to internal/frontend/serve/browser_tabs.go diff --git a/internal/serve/browser_tabs_test.go b/internal/frontend/serve/browser_tabs_test.go similarity index 91% rename from internal/serve/browser_tabs_test.go rename to internal/frontend/serve/browser_tabs_test.go index 91a2b01f6d..fbb9ae8ecd 100644 --- a/internal/serve/browser_tabs_test.go +++ b/internal/frontend/serve/browser_tabs_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // A pane with no browser answers an empty list, never null: the page reads the diff --git a/internal/serve/capability_project.go b/internal/frontend/serve/capability_project.go similarity index 96% rename from internal/serve/capability_project.go rename to internal/frontend/serve/capability_project.go index d1229ed8b6..8690a78afa 100644 --- a/internal/serve/capability_project.go +++ b/internal/frontend/serve/capability_project.go @@ -4,9 +4,9 @@ import ( "net/http" "strings" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/skill" + "reasonix/internal/contract/config" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" ) // Only the session pointed at a folder knows whether its servers came up, so a diff --git a/internal/serve/capability_project_test.go b/internal/frontend/serve/capability_project_test.go similarity index 95% rename from internal/serve/capability_project_test.go rename to internal/frontend/serve/capability_project_test.go index 84708bd4e2..e21934a57f 100644 --- a/internal/serve/capability_project_test.go +++ b/internal/frontend/serve/capability_project_test.go @@ -3,7 +3,7 @@ package serve import ( "testing" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // A repository-declared server nobody answered for is off, but not because the diff --git a/internal/serve/capability_scope.go b/internal/frontend/serve/capability_scope.go similarity index 97% rename from internal/serve/capability_scope.go rename to internal/frontend/serve/capability_scope.go index 2d864192a8..a05c3686c5 100644 --- a/internal/serve/capability_scope.go +++ b/internal/frontend/serve/capability_scope.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "reasonix/internal/control" + "reasonix/internal/session/control" ) func scopeView(ctl control.SessionAPI) control.CapabilityScope { return ctl.CapabilityScope() } diff --git a/internal/serve/catalog.go b/internal/frontend/serve/catalog.go similarity index 99% rename from internal/serve/catalog.go rename to internal/frontend/serve/catalog.go index 9ff6dce388..827981f020 100644 --- a/internal/serve/catalog.go +++ b/internal/frontend/serve/catalog.go @@ -6,12 +6,12 @@ import ( "net/http" "strings" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/mcpsetup" - "reasonix/internal/plugin" - "reasonix/internal/skill" - "reasonix/internal/textutil" + "reasonix/internal/base/textutil" + "reasonix/internal/contract/config" + "reasonix/internal/ext/mcpsetup" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" ) // slashEntry is one thing the user can type after "/". Kind separates the two diff --git a/internal/serve/catalog_refusal_test.go b/internal/frontend/serve/catalog_refusal_test.go similarity index 97% rename from internal/serve/catalog_refusal_test.go rename to internal/frontend/serve/catalog_refusal_test.go index 4a5bf65b87..f7dff39761 100644 --- a/internal/serve/catalog_refusal_test.go +++ b/internal/frontend/serve/catalog_refusal_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/plugin" - "reasonix/internal/skill" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" ) // Who failed decides the class. Every one of these used to be 400: a name diff --git a/internal/serve/catalog_test.go b/internal/frontend/serve/catalog_test.go similarity index 98% rename from internal/serve/catalog_test.go rename to internal/frontend/serve/catalog_test.go index 4d84b3c4e7..d98633e072 100644 --- a/internal/serve/catalog_test.go +++ b/internal/frontend/serve/catalog_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - "reasonix/internal/command" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/plugin" - "reasonix/internal/skill" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/ext/command" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/session/control" ) func fetchSlash(t *testing.T, ctrl *control.Controller) []slashEntry { diff --git a/internal/serve/changes.go b/internal/frontend/serve/changes.go similarity index 98% rename from internal/serve/changes.go rename to internal/frontend/serve/changes.go index 9d748ef5db..9247cc0b61 100644 --- a/internal/serve/changes.go +++ b/internal/frontend/serve/changes.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "reasonix/internal/gitstatus" + "reasonix/internal/platform/gitstatus" ) // changes reports what the working tree currently differs by. A frontend that diff --git a/internal/serve/changes_test.go b/internal/frontend/serve/changes_test.go similarity index 95% rename from internal/serve/changes_test.go rename to internal/frontend/serve/changes_test.go index 7f0723c9c1..03b466d788 100644 --- a/internal/serve/changes_test.go +++ b/internal/frontend/serve/changes_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // The panel behind this endpoint used to infer pending changes from tool events, diff --git a/internal/serve/compact.go b/internal/frontend/serve/compact.go similarity index 97% rename from internal/serve/compact.go rename to internal/frontend/serve/compact.go index 28d882077d..9413d5bc21 100644 --- a/internal/serve/compact.go +++ b/internal/frontend/serve/compact.go @@ -4,7 +4,7 @@ import ( "log/slog" "net/http" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) func (s *Server) compact(w http.ResponseWriter, r *http.Request) { diff --git a/internal/serve/compaction_settings.go b/internal/frontend/serve/compaction_settings.go similarity index 100% rename from internal/serve/compaction_settings.go rename to internal/frontend/serve/compaction_settings.go diff --git a/internal/serve/complete.go b/internal/frontend/serve/complete.go similarity index 97% rename from internal/serve/complete.go rename to internal/frontend/serve/complete.go index 91d08ccadf..cf35377a3c 100644 --- a/internal/serve/complete.go +++ b/internal/frontend/serve/complete.go @@ -4,8 +4,8 @@ import ( "net/http" "strconv" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // maxCompleteLine caps the line a client may ask about. The composer sends one diff --git a/internal/serve/complete_test.go b/internal/frontend/serve/complete_test.go similarity index 97% rename from internal/serve/complete_test.go rename to internal/frontend/serve/complete_test.go index 1897705587..40389de865 100644 --- a/internal/serve/complete_test.go +++ b/internal/frontend/serve/complete_test.go @@ -12,10 +12,10 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) func completeAt(t *testing.T, ctrl *control.Controller, line string, cursor int) control.Completion { diff --git a/internal/serve/config_file.go b/internal/frontend/serve/config_file.go similarity index 100% rename from internal/serve/config_file.go rename to internal/frontend/serve/config_file.go diff --git a/internal/serve/config_file_test.go b/internal/frontend/serve/config_file_test.go similarity index 98% rename from internal/serve/config_file_test.go rename to internal/frontend/serve/config_file_test.go index fa9170d6f2..7029ebde31 100644 --- a/internal/serve/config_file_test.go +++ b/internal/frontend/serve/config_file_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // The line a Windows user writes by hand, and the file it leaves unreadable. diff --git a/internal/serve/context_window.go b/internal/frontend/serve/context_window.go similarity index 99% rename from internal/serve/context_window.go rename to internal/frontend/serve/context_window.go index 9e65bb3d3c..e83e84b230 100644 --- a/internal/serve/context_window.go +++ b/internal/frontend/serve/context_window.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // contextView is the gauge and what fills it. Named rather than anonymous diff --git a/internal/serve/context_window_test.go b/internal/frontend/serve/context_window_test.go similarity index 98% rename from internal/serve/context_window_test.go rename to internal/frontend/serve/context_window_test.go index a27324d38c..d0af86109d 100644 --- a/internal/serve/context_window_test.go +++ b/internal/frontend/serve/context_window_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) func declareWindow(t *testing.T, base, body string) *http.Response { diff --git a/internal/serve/csrf_test.go b/internal/frontend/serve/csrf_test.go similarity index 94% rename from internal/serve/csrf_test.go rename to internal/frontend/serve/csrf_test.go index d3ebf9f0e8..af62819abf 100644 --- a/internal/serve/csrf_test.go +++ b/internal/frontend/serve/csrf_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // TestServeRejectsNonJSONPost guards the CSRF defense: a state-changing POST that diff --git a/internal/serve/decisions_status_test.go b/internal/frontend/serve/decisions_status_test.go similarity index 88% rename from internal/serve/decisions_status_test.go rename to internal/frontend/serve/decisions_status_test.go index e8e9cc1715..1c0e35cbf8 100644 --- a/internal/serve/decisions_status_test.go +++ b/internal/frontend/serve/decisions_status_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/permission" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/session/control" ) // A frontend correlates the projection with the request it already drew a card diff --git a/internal/serve/drop.go b/internal/frontend/serve/drop.go similarity index 98% rename from internal/serve/drop.go rename to internal/frontend/serve/drop.go index 8bf089acad..1e9c7c633a 100644 --- a/internal/serve/drop.go +++ b/internal/frontend/serve/drop.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // maxDroppedPaths bounds one drop. The body limit alone would not: each path diff --git a/internal/serve/drop_test.go b/internal/frontend/serve/drop_test.go similarity index 98% rename from internal/serve/drop_test.go rename to internal/frontend/serve/drop_test.go index a2fe395653..8b7f2b6e65 100644 --- a/internal/serve/drop_test.go +++ b/internal/frontend/serve/drop_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // A window knows where a dropped file lives, so the turn must reference that diff --git a/internal/serve/editor.go b/internal/frontend/serve/editor.go similarity index 95% rename from internal/serve/editor.go rename to internal/frontend/serve/editor.go index 4a36402dc4..16349d8cb1 100644 --- a/internal/serve/editor.go +++ b/internal/frontend/serve/editor.go @@ -4,8 +4,8 @@ import ( "errors" "net/http" - "reasonix/internal/config" - "reasonix/internal/editor" + "reasonix/internal/contract/config" + "reasonix/internal/platform/editor" ) // AllowEditorOpen grants POST /workspace/editor. Off until a host asks for it: diff --git a/internal/serve/editor_test.go b/internal/frontend/serve/editor_test.go similarity index 96% rename from internal/serve/editor_test.go rename to internal/frontend/serve/editor_test.go index 41eff0b1e0..9cc8f77967 100644 --- a/internal/serve/editor_test.go +++ b/internal/frontend/serve/editor_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) func editorServer(t *testing.T, granted bool) *Server { diff --git a/internal/serve/effort_refusal_test.go b/internal/frontend/serve/effort_refusal_test.go similarity index 95% rename from internal/serve/effort_refusal_test.go rename to internal/frontend/serve/effort_refusal_test.go index 848e032801..b80e89e2a9 100644 --- a/internal/serve/effort_refusal_test.go +++ b/internal/frontend/serve/effort_refusal_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // An endpoint with no effort vocabulary refusing a level is an answer about the diff --git a/internal/serve/effort_test.go b/internal/frontend/serve/effort_test.go similarity index 98% rename from internal/serve/effort_test.go rename to internal/frontend/serve/effort_test.go index 3a9c52bcbb..ef7ba54128 100644 --- a/internal/serve/effort_test.go +++ b/internal/frontend/serve/effort_test.go @@ -3,7 +3,7 @@ package serve import ( "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func TestApplyEffortEditUpsertsMissingProvider(t *testing.T) { diff --git a/internal/serve/eventstream.go b/internal/frontend/serve/eventstream.go similarity index 99% rename from internal/serve/eventstream.go rename to internal/frontend/serve/eventstream.go index 2123c0e148..9f76b6726a 100644 --- a/internal/serve/eventstream.go +++ b/internal/frontend/serve/eventstream.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // SSEWatermarkInterval is how often a transport restates the last numbered diff --git a/internal/serve/eventstream_test.go b/internal/frontend/serve/eventstream_test.go similarity index 99% rename from internal/serve/eventstream_test.go rename to internal/frontend/serve/eventstream_test.go index 1705513a7f..8658e6044d 100644 --- a/internal/serve/eventstream_test.go +++ b/internal/frontend/serve/eventstream_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) func kindOf(t *testing.T, data []byte) string { diff --git a/internal/serve/executiongraph.go b/internal/frontend/serve/executiongraph.go similarity index 98% rename from internal/serve/executiongraph.go rename to internal/frontend/serve/executiongraph.go index 47b5f39f26..440b14b8b1 100644 --- a/internal/serve/executiongraph.go +++ b/internal/frontend/serve/executiongraph.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "reasonix/internal/control" + "reasonix/internal/session/control" ) const executionGraphSchemaVersion = 1 diff --git a/internal/serve/executiongraph_test.go b/internal/frontend/serve/executiongraph_test.go similarity index 97% rename from internal/serve/executiongraph_test.go rename to internal/frontend/serve/executiongraph_test.go index deb050efcc..418ac97299 100644 --- a/internal/serve/executiongraph_test.go +++ b/internal/frontend/serve/executiongraph_test.go @@ -7,9 +7,9 @@ import ( "sync" "testing" - "reasonix/internal/agentgraph" - "reasonix/internal/control" - "reasonix/internal/event" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/session/control" ) // settlingController fires a transition while the rebuild is running, which is diff --git a/internal/serve/extensions.go b/internal/frontend/serve/extensions.go similarity index 100% rename from internal/serve/extensions.go rename to internal/frontend/serve/extensions.go diff --git a/internal/serve/extensions_test.go b/internal/frontend/serve/extensions_test.go similarity index 98% rename from internal/serve/extensions_test.go rename to internal/frontend/serve/extensions_test.go index f6350bb662..778f439531 100644 --- a/internal/serve/extensions_test.go +++ b/internal/frontend/serve/extensions_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // extensionCtl records what the endpoints hand the controller. Embedding diff --git a/internal/serve/fail.go b/internal/frontend/serve/fail.go similarity index 99% rename from internal/serve/fail.go rename to internal/frontend/serve/fail.go index c42882dad6..bb6bb57c70 100644 --- a/internal/serve/fail.go +++ b/internal/frontend/serve/fail.go @@ -6,7 +6,7 @@ import ( "errors" "net/http" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // Reason is a machine-readable refusal: the kernel decides what happened, a diff --git a/internal/serve/frontend_contract_test.go b/internal/frontend/serve/frontend_contract_test.go similarity index 97% rename from internal/serve/frontend_contract_test.go rename to internal/frontend/serve/frontend_contract_test.go index 4963e75ad5..57c8961190 100644 --- a/internal/serve/frontend_contract_test.go +++ b/internal/frontend/serve/frontend_contract_test.go @@ -15,7 +15,7 @@ import ( // is not a fault, since the CLI and the setup page reach some of them, while a // call with no route always is. func TestFrontendCallsOnlyPathsThisPackageServes(t *testing.T) { - front := filepath.Join("..", "..", "desktop", "frontend-next", "src", "port") + front := filepath.Join("..", "..", "..", "desktop", "frontend-next", "src", "port") entries, err := os.ReadDir(front) if err != nil { t.Skipf("frontend port layer unavailable: %v", err) diff --git a/internal/serve/history.go b/internal/frontend/serve/history.go similarity index 98% rename from internal/serve/history.go rename to internal/frontend/serve/history.go index c8fdddb844..c3c58dc608 100644 --- a/internal/serve/history.go +++ b/internal/frontend/serve/history.go @@ -3,8 +3,8 @@ package serve import ( "net/http" - "reasonix/internal/agent" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) type historyToolCall struct { diff --git a/internal/serve/history_failure_test.go b/internal/frontend/serve/history_failure_test.go similarity index 98% rename from internal/serve/history_failure_test.go rename to internal/frontend/serve/history_failure_test.go index 37e0e9abce..21a4b95a9c 100644 --- a/internal/serve/history_failure_test.go +++ b/internal/frontend/serve/history_failure_test.go @@ -3,8 +3,8 @@ package serve import ( "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // A rebuilt card knows a call failed because the host said so, not because the diff --git a/internal/serve/hooks.go b/internal/frontend/serve/hooks.go similarity index 99% rename from internal/serve/hooks.go rename to internal/frontend/serve/hooks.go index 1dcea80463..06c3cf0a07 100644 --- a/internal/serve/hooks.go +++ b/internal/frontend/serve/hooks.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "reasonix/internal/hook" + "reasonix/internal/ext/hook" ) // hookEntry is one configured rule. Blocking and issues are computed here rather diff --git a/internal/serve/host_authored_history_test.go b/internal/frontend/serve/host_authored_history_test.go similarity index 91% rename from internal/serve/host_authored_history_test.go rename to internal/frontend/serve/host_authored_history_test.go index e353f4b951..813fa2305e 100644 --- a/internal/serve/host_authored_history_test.go +++ b/internal/frontend/serve/host_authored_history_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/agent/testutil" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/agent/testutil" + "reasonix/internal/session/control" ) // TestApprovedPlanLeavesOneUserLineInHistory is the reload half of the live diff --git a/internal/serve/hub.go b/internal/frontend/serve/hub.go similarity index 98% rename from internal/serve/hub.go rename to internal/frontend/serve/hub.go index 59959a51f4..4b08c27573 100644 --- a/internal/serve/hub.go +++ b/internal/frontend/serve/hub.go @@ -12,18 +12,18 @@ import ( "strings" "sync" - "reasonix/internal/agent" - "reasonix/internal/billing" - "reasonix/internal/boot" + "reasonix/internal/assembly/boot" + "reasonix/internal/model/billing" + "reasonix/internal/runtime/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/fileutil" - "reasonix/internal/notify" - "reasonix/internal/provider" - "reasonix/internal/surface" - "reasonix/internal/update" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/platform/notify" + "reasonix/internal/platform/update" + "reasonix/internal/session/control" ) // surface is the frontend this hub serves. Every server it adopts and every diff --git a/internal/serve/hub_approval_test.go b/internal/frontend/serve/hub_approval_test.go similarity index 96% rename from internal/serve/hub_approval_test.go rename to internal/frontend/serve/hub_approval_test.go index a47f8080a6..1195c74a6c 100644 --- a/internal/serve/hub_approval_test.go +++ b/internal/frontend/serve/hub_approval_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // adoptedPane is the window's own runtime: assembled by the host, then handed diff --git a/internal/serve/hub_balance_test.go b/internal/frontend/serve/hub_balance_test.go similarity index 96% rename from internal/serve/hub_balance_test.go rename to internal/frontend/serve/hub_balance_test.go index ee22f4571a..93cef8e8e8 100644 --- a/internal/serve/hub_balance_test.go +++ b/internal/frontend/serve/hub_balance_test.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) // writeWalletConfig points the default provider at a wallet endpoint the test diff --git a/internal/serve/hub_decision_audit_test.go b/internal/frontend/serve/hub_decision_audit_test.go similarity index 90% rename from internal/serve/hub_decision_audit_test.go rename to internal/frontend/serve/hub_decision_audit_test.go index e735972e36..3a947de9c5 100644 --- a/internal/serve/hub_decision_audit_test.go +++ b/internal/frontend/serve/hub_decision_audit_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/session/control" ) // ATTACK: two panes mint decision ids from their own counters, so both hand out diff --git a/internal/serve/hub_interactive_test.go b/internal/frontend/serve/hub_interactive_test.go similarity index 92% rename from internal/serve/hub_interactive_test.go rename to internal/frontend/serve/hub_interactive_test.go index 23abbfe3c6..e6bcd72b6d 100644 --- a/internal/serve/hub_interactive_test.go +++ b/internal/frontend/serve/hub_interactive_test.go @@ -5,14 +5,14 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/session/control" ) // askingProvider calls the ask tool once and then finishes. diff --git a/internal/serve/hub_lease_test.go b/internal/frontend/serve/hub_lease_test.go similarity index 97% rename from internal/serve/hub_lease_test.go rename to internal/frontend/serve/hub_lease_test.go index f60a45b5fe..0d508ad302 100644 --- a/internal/serve/hub_lease_test.go +++ b/internal/frontend/serve/hub_lease_test.go @@ -4,10 +4,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // studioPane builds a runtime the way the desktop shell does: a controller with diff --git a/internal/serve/hub_open_refusal_test.go b/internal/frontend/serve/hub_open_refusal_test.go similarity index 96% rename from internal/serve/hub_open_refusal_test.go rename to internal/frontend/serve/hub_open_refusal_test.go index 7fe99f68e7..09f1de762f 100644 --- a/internal/serve/hub_open_refusal_test.go +++ b/internal/frontend/serve/hub_open_refusal_test.go @@ -10,9 +10,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" ) // A pane the hub builds itself goes through boot, which needs a provider it can diff --git a/internal/serve/hub_picker.go b/internal/frontend/serve/hub_picker.go similarity index 100% rename from internal/serve/hub_picker.go rename to internal/frontend/serve/hub_picker.go diff --git a/internal/serve/hub_picker_other.go b/internal/frontend/serve/hub_picker_other.go similarity index 100% rename from internal/serve/hub_picker_other.go rename to internal/frontend/serve/hub_picker_other.go diff --git a/internal/serve/hub_picker_test.go b/internal/frontend/serve/hub_picker_test.go similarity index 100% rename from internal/serve/hub_picker_test.go rename to internal/frontend/serve/hub_picker_test.go diff --git a/internal/serve/hub_picker_windows.go b/internal/frontend/serve/hub_picker_windows.go similarity index 100% rename from internal/serve/hub_picker_windows.go rename to internal/frontend/serve/hub_picker_windows.go diff --git a/internal/serve/hub_release.go b/internal/frontend/serve/hub_release.go similarity index 100% rename from internal/serve/hub_release.go rename to internal/frontend/serve/hub_release.go diff --git a/internal/serve/hub_remote.go b/internal/frontend/serve/hub_remote.go similarity index 99% rename from internal/serve/hub_remote.go rename to internal/frontend/serve/hub_remote.go index 0d2e8def80..9ef410c8b1 100644 --- a/internal/serve/hub_remote.go +++ b/internal/frontend/serve/hub_remote.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // RemoteEndpoint is a `reasonix serve` on another machine, already reachable at diff --git a/internal/serve/hub_remote_test.go b/internal/frontend/serve/hub_remote_test.go similarity index 99% rename from internal/serve/hub_remote_test.go rename to internal/frontend/serve/hub_remote_test.go index acec31db47..25fd72fc8a 100644 --- a/internal/serve/hub_remote_test.go +++ b/internal/frontend/serve/hub_remote_test.go @@ -16,8 +16,8 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) // stubAttacher stands in for the window's link layer. diff --git a/internal/serve/hub_resolver_test.go b/internal/frontend/serve/hub_resolver_test.go similarity index 96% rename from internal/serve/hub_resolver_test.go rename to internal/frontend/serve/hub_resolver_test.go index d65bdeb0dd..1148c11a98 100644 --- a/internal/serve/hub_resolver_test.go +++ b/internal/frontend/serve/hub_resolver_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) type homeProvider struct{} diff --git a/internal/serve/hub_serve.go b/internal/frontend/serve/hub_serve.go similarity index 100% rename from internal/serve/hub_serve.go rename to internal/frontend/serve/hub_serve.go diff --git a/internal/serve/hub_test.go b/internal/frontend/serve/hub_test.go similarity index 98% rename from internal/serve/hub_test.go rename to internal/frontend/serve/hub_test.go index 8e03f396ca..33735d8ca0 100644 --- a/internal/serve/hub_test.go +++ b/internal/frontend/serve/hub_test.go @@ -13,12 +13,12 @@ import ( "testing" "testing/fstest" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/provider" - "reasonix/internal/surface" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) func hubRuntime(t *testing.T, h *Hub, root string) *Runtime { diff --git a/internal/serve/hub_tree.go b/internal/frontend/serve/hub_tree.go similarity index 98% rename from internal/serve/hub_tree.go rename to internal/frontend/serve/hub_tree.go index 27ce832e43..e9f4bcef98 100644 --- a/internal/serve/hub_tree.go +++ b/internal/frontend/serve/hub_tree.go @@ -9,13 +9,13 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/fileutil" - "reasonix/internal/migration" - "reasonix/internal/store" - "reasonix/internal/worktree" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/platform/worktree" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/migration" + "reasonix/internal/state/store" ) // treeSessionsPerWorkspace bounds one workspace's branch of the tree. A long diff --git a/internal/serve/hub_tree_remove_test.go b/internal/frontend/serve/hub_tree_remove_test.go similarity index 98% rename from internal/serve/hub_tree_remove_test.go rename to internal/frontend/serve/hub_tree_remove_test.go index be5ed1b829..f690e065f7 100644 --- a/internal/serve/hub_tree_remove_test.go +++ b/internal/frontend/serve/hub_tree_remove_test.go @@ -11,10 +11,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) func writeSessionAt(t *testing.T, path string) { diff --git a/internal/serve/inbox.go b/internal/frontend/serve/inbox.go similarity index 98% rename from internal/serve/inbox.go rename to internal/frontend/serve/inbox.go index 489e254b2e..7d4ff1980a 100644 --- a/internal/serve/inbox.go +++ b/internal/frontend/serve/inbox.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "reasonix/internal/control" - "reasonix/internal/sessioninbox" + "reasonix/internal/session/control" + "reasonix/internal/state/sessioninbox" ) func (s *Server) registerInboxRoutes(mux *http.ServeMux) { diff --git a/internal/serve/inbox_refusal_test.go b/internal/frontend/serve/inbox_refusal_test.go similarity index 97% rename from internal/serve/inbox_refusal_test.go rename to internal/frontend/serve/inbox_refusal_test.go index d81781024b..6564d28abb 100644 --- a/internal/serve/inbox_refusal_test.go +++ b/internal/frontend/serve/inbox_refusal_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/control" - "reasonix/internal/sessioninbox" + "reasonix/internal/session/control" + "reasonix/internal/state/sessioninbox" ) // Every condition the inbox store refuses reaches a frontend as an identity it diff --git a/internal/serve/inbox_test.go b/internal/frontend/serve/inbox_test.go similarity index 93% rename from internal/serve/inbox_test.go rename to internal/frontend/serve/inbox_test.go index 3693ce33aa..3d4e0bf8b2 100644 --- a/internal/serve/inbox_test.go +++ b/internal/frontend/serve/inbox_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/control" - "reasonix/internal/sessioninbox" + "reasonix/internal/session/control" + "reasonix/internal/state/sessioninbox" ) // Deleting a queued line has two answers a frontend has to tell apart: it is diff --git a/internal/serve/listen.go b/internal/frontend/serve/listen.go similarity index 100% rename from internal/serve/listen.go rename to internal/frontend/serve/listen.go diff --git a/internal/serve/login.html b/internal/frontend/serve/login.html similarity index 100% rename from internal/serve/login.html rename to internal/frontend/serve/login.html diff --git a/internal/serve/logo-wordmark.svg b/internal/frontend/serve/logo-wordmark.svg similarity index 100% rename from internal/serve/logo-wordmark.svg rename to internal/frontend/serve/logo-wordmark.svg diff --git a/internal/serve/loopback.go b/internal/frontend/serve/loopback.go similarity index 100% rename from internal/serve/loopback.go rename to internal/frontend/serve/loopback.go diff --git a/internal/serve/loopback_test.go b/internal/frontend/serve/loopback_test.go similarity index 99% rename from internal/serve/loopback_test.go rename to internal/frontend/serve/loopback_test.go index 9132d2fd67..86e97b5950 100644 --- a/internal/serve/loopback_test.go +++ b/internal/frontend/serve/loopback_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/session/control" ) const loopbackToken = "loopback-test-credential-0123456789" diff --git a/internal/serve/main_test.go b/internal/frontend/serve/main_test.go similarity index 76% rename from internal/serve/main_test.go rename to internal/frontend/serve/main_test.go index 68fcef3b26..49b52c7bbe 100644 --- a/internal/serve/main_test.go +++ b/internal/frontend/serve/main_test.go @@ -3,7 +3,7 @@ package serve import ( "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestMain(m *testing.M) { diff --git a/internal/serve/memory.go b/internal/frontend/serve/memory.go similarity index 99% rename from internal/serve/memory.go rename to internal/frontend/serve/memory.go index d41500a00a..3bcb198573 100644 --- a/internal/serve/memory.go +++ b/internal/frontend/serve/memory.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "reasonix/internal/memory" + "reasonix/internal/state/memory" ) // memoryEntry is one saved fact. Activation is the field that matters most to a diff --git a/internal/serve/model_refs_test.go b/internal/frontend/serve/model_refs_test.go similarity index 96% rename from internal/serve/model_refs_test.go rename to internal/frontend/serve/model_refs_test.go index f0da9c49e0..ffddc5aa3a 100644 --- a/internal/serve/model_refs_test.go +++ b/internal/frontend/serve/model_refs_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) const extensionModelRef = "plugin/demo/cloud/extension-chat" diff --git a/internal/serve/modelcaps.go b/internal/frontend/serve/modelcaps.go similarity index 98% rename from internal/serve/modelcaps.go rename to internal/frontend/serve/modelcaps.go index 99d958bda7..096976fa92 100644 --- a/internal/serve/modelcaps.go +++ b/internal/frontend/serve/modelcaps.go @@ -5,7 +5,7 @@ import ( "net/url" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // modelPrice is list price per 1M tokens, as the provider entry declares it. diff --git a/internal/serve/modelcaps_test.go b/internal/frontend/serve/modelcaps_test.go similarity index 98% rename from internal/serve/modelcaps_test.go rename to internal/frontend/serve/modelcaps_test.go index 3bf463907e..366e38e9d5 100644 --- a/internal/serve/modelcaps_test.go +++ b/internal/frontend/serve/modelcaps_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // One host reached under both protocols, holding a mixed vision/text model set, diff --git a/internal/serve/modelroutes_test.go b/internal/frontend/serve/modelroutes_test.go similarity index 100% rename from internal/serve/modelroutes_test.go rename to internal/frontend/serve/modelroutes_test.go diff --git a/internal/serve/models_catalog.go b/internal/frontend/serve/models_catalog.go similarity index 96% rename from internal/serve/models_catalog.go rename to internal/frontend/serve/models_catalog.go index eeeda7d4fc..d84475acb5 100644 --- a/internal/serve/models_catalog.go +++ b/internal/frontend/serve/models_catalog.go @@ -4,8 +4,8 @@ import ( "net/http" "strings" - "reasonix/internal/config" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) // resolverModels answers /models for a pane whose models resolve through a diff --git a/internal/serve/modelswitch_test.go b/internal/frontend/serve/modelswitch_test.go similarity index 95% rename from internal/serve/modelswitch_test.go rename to internal/frontend/serve/modelswitch_test.go index 78a85c7c60..a41c3aeeb1 100644 --- a/internal/serve/modelswitch_test.go +++ b/internal/frontend/serve/modelswitch_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // TestControllerAccessorIsRaceSafe guards the switchModel concurrency contract: diff --git a/internal/serve/network.go b/internal/frontend/serve/network.go similarity index 97% rename from internal/serve/network.go rename to internal/frontend/serve/network.go index 3d6d631bc4..507ff841f1 100644 --- a/internal/serve/network.go +++ b/internal/frontend/serve/network.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // network returns the proxy settings. The stored password never comes back out — diff --git a/internal/serve/notifications.go b/internal/frontend/serve/notifications.go similarity index 98% rename from internal/serve/notifications.go rename to internal/frontend/serve/notifications.go index 2fc17e54a8..85024aaab5 100644 --- a/internal/serve/notifications.go +++ b/internal/frontend/serve/notifications.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // NotifyPrefs is what a window can be asked about the desktop notifications it diff --git a/internal/serve/page.go b/internal/frontend/serve/page.go similarity index 100% rename from internal/serve/page.go rename to internal/frontend/serve/page.go diff --git a/internal/serve/page_test.go b/internal/frontend/serve/page_test.go similarity index 98% rename from internal/serve/page_test.go rename to internal/frontend/serve/page_test.go index 19715f02d2..d537976c77 100644 --- a/internal/serve/page_test.go +++ b/internal/frontend/serve/page_test.go @@ -10,7 +10,7 @@ import ( "testing" "testing/fstest" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // The page's own files answer for themselves and every other path is the diff --git a/internal/serve/pane_sink.go b/internal/frontend/serve/pane_sink.go similarity index 93% rename from internal/serve/pane_sink.go rename to internal/frontend/serve/pane_sink.go index ed1e8b5ba8..6879eca5db 100644 --- a/internal/serve/pane_sink.go +++ b/internal/frontend/serve/pane_sink.go @@ -2,8 +2,8 @@ package serve import ( - "reasonix/internal/event" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" ) // SetPaneSink records the host's decoration around bc — the sink the controller diff --git a/internal/serve/plan.go b/internal/frontend/serve/plan.go similarity index 97% rename from internal/serve/plan.go rename to internal/frontend/serve/plan.go index 73493445ac..771f3829b4 100644 --- a/internal/serve/plan.go +++ b/internal/frontend/serve/plan.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // planDecision answers a plan card without collapsing its three outcomes into diff --git a/internal/serve/plugins.go b/internal/frontend/serve/plugins.go similarity index 98% rename from internal/serve/plugins.go rename to internal/frontend/serve/plugins.go index 8442700b7e..96b5575542 100644 --- a/internal/serve/plugins.go +++ b/internal/frontend/serve/plugins.go @@ -9,10 +9,10 @@ import ( "net/http" "strings" - "reasonix/internal/config" - "reasonix/internal/hook" - "reasonix/internal/installsource" - "reasonix/internal/pluginpkg" + "reasonix/internal/contract/config" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/installsource" + "reasonix/internal/ext/pluginpkg" ) // A package's capabilities are assembled at boot, so every write here ends diff --git a/internal/serve/plugins_test.go b/internal/frontend/serve/plugins_test.go similarity index 98% rename from internal/serve/plugins_test.go rename to internal/frontend/serve/plugins_test.go index 66468c2846..cd4fd1014a 100644 --- a/internal/serve/plugins_test.go +++ b/internal/frontend/serve/plugins_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/pluginpkg" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/session/control" ) // pluginCtl is the controller half these routes touch: where a source path is diff --git a/internal/serve/prompt_refine.go b/internal/frontend/serve/prompt_refine.go similarity index 97% rename from internal/serve/prompt_refine.go rename to internal/frontend/serve/prompt_refine.go index 4ac508e6a0..0cd2405ac0 100644 --- a/internal/serve/prompt_refine.go +++ b/internal/frontend/serve/prompt_refine.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "reasonix/internal/promptrefine" + "reasonix/internal/runtime/promptrefine" ) // refinePrompt answers a draft rewritten by the session's model. Only the diff --git a/internal/serve/prompt_refine_test.go b/internal/frontend/serve/prompt_refine_test.go similarity index 93% rename from internal/serve/prompt_refine_test.go rename to internal/frontend/serve/prompt_refine_test.go index 0a3ab5776f..273d2712bd 100644 --- a/internal/serve/prompt_refine_test.go +++ b/internal/frontend/serve/prompt_refine_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/promptrefine" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/promptrefine" + "reasonix/internal/session/control" ) type refineProvider struct{ answer string } diff --git a/internal/serve/provider_check.go b/internal/frontend/serve/provider_check.go similarity index 98% rename from internal/serve/provider_check.go rename to internal/frontend/serve/provider_check.go index 844a48d673..0b3bc32971 100644 --- a/internal/serve/provider_check.go +++ b/internal/frontend/serve/provider_check.go @@ -9,10 +9,10 @@ import ( "net/http" "strings" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/netclient" - "reasonix/internal/provider" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) // providerCheck is what re-probing a saved provider found. Kind is the protocol diff --git a/internal/serve/provider_check_test.go b/internal/frontend/serve/provider_check_test.go similarity index 99% rename from internal/serve/provider_check_test.go rename to internal/frontend/serve/provider_check_test.go index 8f26b94ab2..2ee2260e53 100644 --- a/internal/serve/provider_check_test.go +++ b/internal/frontend/serve/provider_check_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) // The endpoint in the fixture does not exist, so the probe fails — and that diff --git a/internal/serve/provider_continuation_test.go b/internal/frontend/serve/provider_continuation_test.go similarity index 98% rename from internal/serve/provider_continuation_test.go rename to internal/frontend/serve/provider_continuation_test.go index d68c9ef85e..83e769df24 100644 --- a/internal/serve/provider_continuation_test.go +++ b/internal/frontend/serve/provider_continuation_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // Two entries on one file: the choice exists for the Responses wire and not for diff --git a/internal/serve/provider_edit.go b/internal/frontend/serve/provider_edit.go similarity index 99% rename from internal/serve/provider_edit.go rename to internal/frontend/serve/provider_edit.go index 7b2f736663..64407cf15c 100644 --- a/internal/serve/provider_edit.go +++ b/internal/frontend/serve/provider_edit.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // editProvider changes only the fields this panel owns and leaves the rest of diff --git a/internal/serve/provider_edit_test.go b/internal/frontend/serve/provider_edit_test.go similarity index 99% rename from internal/serve/provider_edit_test.go rename to internal/frontend/serve/provider_edit_test.go index 322927a697..209e091deb 100644 --- a/internal/serve/provider_edit_test.go +++ b/internal/frontend/serve/provider_edit_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // A source the panel cannot fully describe: per-model prices and effort diff --git a/internal/serve/provider_keyreuse.go b/internal/frontend/serve/provider_keyreuse.go similarity index 96% rename from internal/serve/provider_keyreuse.go rename to internal/frontend/serve/provider_keyreuse.go index 2b4b97bfce..e7a8e18740 100644 --- a/internal/serve/provider_keyreuse.go +++ b/internal/frontend/serve/provider_keyreuse.go @@ -4,7 +4,7 @@ package serve import ( "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // keyEnvForNewSource decides which credential slot a newly added source writes. diff --git a/internal/serve/provider_keyreuse_test.go b/internal/frontend/serve/provider_keyreuse_test.go similarity index 98% rename from internal/serve/provider_keyreuse_test.go rename to internal/frontend/serve/provider_keyreuse_test.go index 91d4ed05fa..7d7b89918a 100644 --- a/internal/serve/provider_keyreuse_test.go +++ b/internal/frontend/serve/provider_keyreuse_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func savedProvider(t *testing.T, name string) *config.ProviderEntry { diff --git a/internal/serve/provider_setup.go b/internal/frontend/serve/provider_setup.go similarity index 99% rename from internal/serve/provider_setup.go rename to internal/frontend/serve/provider_setup.go index 0553a5f52f..43375d7856 100644 --- a/internal/serve/provider_setup.go +++ b/internal/frontend/serve/provider_setup.go @@ -11,7 +11,7 @@ import ( "net/http" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) const providerSetupMaxBody = 20 << 10 diff --git a/internal/serve/provider_setup_test.go b/internal/frontend/serve/provider_setup_test.go similarity index 99% rename from internal/serve/provider_setup_test.go rename to internal/frontend/serve/provider_setup_test.go index 2ae8a23239..88b550b619 100644 --- a/internal/serve/provider_setup_test.go +++ b/internal/frontend/serve/provider_setup_test.go @@ -15,9 +15,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) const providerSetupTestKeyEnv = "REASONIX_REMOTE_SETUP_TEST_KEY" diff --git a/internal/serve/provider_thinking_test.go b/internal/frontend/serve/provider_thinking_test.go similarity index 98% rename from internal/serve/provider_thinking_test.go rename to internal/frontend/serve/provider_thinking_test.go index 82db42fcdf..206789c829 100644 --- a/internal/serve/provider_thinking_test.go +++ b/internal/frontend/serve/provider_thinking_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // thinkingOf reads the switch's two fields off the list the panel renders from. diff --git a/internal/serve/providers.go b/internal/frontend/serve/providers.go similarity index 99% rename from internal/serve/providers.go rename to internal/frontend/serve/providers.go index 5fa8181366..d296791f0e 100644 --- a/internal/serve/providers.go +++ b/internal/frontend/serve/providers.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/netclient" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" ) // hostGrants are the surfaces a host opens on behalf of its one local client. diff --git a/internal/serve/providers_test.go b/internal/frontend/serve/providers_test.go similarity index 98% rename from internal/serve/providers_test.go rename to internal/frontend/serve/providers_test.go index c75548c800..567dcd781e 100644 --- a/internal/serve/providers_test.go +++ b/internal/frontend/serve/providers_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/history" - "reasonix/internal/stats" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" + "reasonix/internal/state/history" + "reasonix/internal/state/stats" ) // newProviderEditServer is a server with one configured provider, its config diff --git a/internal/serve/rebuild_sink_test.go b/internal/frontend/serve/rebuild_sink_test.go similarity index 92% rename from internal/serve/rebuild_sink_test.go rename to internal/frontend/serve/rebuild_sink_test.go index e2128cd816..44428b8199 100644 --- a/internal/serve/rebuild_sink_test.go +++ b/internal/frontend/serve/rebuild_sink_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "testing" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/session/control" ) type countingSink struct { diff --git a/internal/serve/rebuild_workspace_test.go b/internal/frontend/serve/rebuild_workspace_test.go similarity index 92% rename from internal/serve/rebuild_workspace_test.go rename to internal/frontend/serve/rebuild_workspace_test.go index 0b5400817f..96816c56ee 100644 --- a/internal/serve/rebuild_workspace_test.go +++ b/internal/frontend/serve/rebuild_workspace_test.go @@ -4,9 +4,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // A model or effort switch rebuilds the runtime. Before this, the replacement diff --git a/internal/serve/recovery_fold_test.go b/internal/frontend/serve/recovery_fold_test.go similarity index 96% rename from internal/serve/recovery_fold_test.go rename to internal/frontend/serve/recovery_fold_test.go index 8e19ea7d34..5f8edde04f 100644 --- a/internal/serve/recovery_fold_test.go +++ b/internal/frontend/serve/recovery_fold_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // divergedConflictCopy writes a conflict copy whose tail differs from its diff --git a/internal/serve/refusal_parity_test.go b/internal/frontend/serve/refusal_parity_test.go similarity index 96% rename from internal/serve/refusal_parity_test.go rename to internal/frontend/serve/refusal_parity_test.go index ae47f45b50..26bb42e8b9 100644 --- a/internal/serve/refusal_parity_test.go +++ b/internal/frontend/serve/refusal_parity_test.go @@ -18,7 +18,7 @@ var codeArg = map[string]int{"refuse": 2, "busy": 1, "coded": 0, "busyErr": 0, " // Where a coded refusal can be built. The exported constructor put the second // one outside this package, and a guard that only watches its own directory // would have let the next one through untranslated. -var refusalDirs = []string{".", filepath.Join("..", "..", "desktop", "next")} +var refusalDirs = []string{".", filepath.Join("..", "..", "..", "desktop", "next")} // serveRefusalCodes reads the codes this package can send, from the syntax // rather than from the text: a scan that matched on wording would be the very @@ -77,7 +77,7 @@ func serveRefusalCodes(t *testing.T) map[string]string { func translatedCodes(t *testing.T) map[string]bool { t.Helper() - path := filepath.Join("..", "..", "desktop", "frontend-next", "src", "i18n", "kernel.ts") + path := filepath.Join("..", "..", "..", "desktop", "frontend-next", "src", "i18n", "kernel.ts") data, err := os.ReadFile(path) if err != nil { t.Skipf("no frontend catalogue: %v", err) diff --git a/internal/serve/refuse_common.go b/internal/frontend/serve/refuse_common.go similarity index 100% rename from internal/serve/refuse_common.go rename to internal/frontend/serve/refuse_common.go diff --git a/internal/serve/reload_options_test.go b/internal/frontend/serve/reload_options_test.go similarity index 93% rename from internal/serve/reload_options_test.go rename to internal/frontend/serve/reload_options_test.go index 3e03949ffc..158a319e74 100644 --- a/internal/serve/reload_options_test.go +++ b/internal/frontend/serve/reload_options_test.go @@ -3,10 +3,10 @@ package serve import ( "testing" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/extension" + "reasonix/internal/assembly/boot" + "reasonix/internal/contract/config" + "reasonix/internal/ext/extension" + "reasonix/internal/session/control" ) // A switch and a reload rebuild the same way but for opposite reasons. A model diff --git a/internal/serve/remote_book.go b/internal/frontend/serve/remote_book.go similarity index 99% rename from internal/serve/remote_book.go rename to internal/frontend/serve/remote_book.go index dbf26159f4..43db96fc60 100644 --- a/internal/serve/remote_book.go +++ b/internal/frontend/serve/remote_book.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // The host book is user-global: a machine is reachable from every project on diff --git a/internal/serve/remote_book_test.go b/internal/frontend/serve/remote_book_test.go similarity index 99% rename from internal/serve/remote_book_test.go rename to internal/frontend/serve/remote_book_test.go index 0e28e5f668..b579139a4f 100644 --- a/internal/serve/remote_book_test.go +++ b/internal/frontend/serve/remote_book_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func bookServer(t *testing.T, attacher RemoteAttacher) *httptest.Server { diff --git a/internal/serve/remote_browse.go b/internal/frontend/serve/remote_browse.go similarity index 100% rename from internal/serve/remote_browse.go rename to internal/frontend/serve/remote_browse.go diff --git a/internal/serve/remote_browse_test.go b/internal/frontend/serve/remote_browse_test.go similarity index 100% rename from internal/serve/remote_browse_test.go rename to internal/frontend/serve/remote_browse_test.go diff --git a/internal/serve/resume.go b/internal/frontend/serve/resume.go similarity index 97% rename from internal/serve/resume.go rename to internal/frontend/serve/resume.go index 2b9e928f23..ff25753f8c 100644 --- a/internal/serve/resume.go +++ b/internal/frontend/serve/resume.go @@ -15,9 +15,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/store" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" + "reasonix/internal/state/store" ) // resume loads a previous session from a JSONL file. diff --git a/internal/serve/rewind.go b/internal/frontend/serve/rewind.go similarity index 98% rename from internal/serve/rewind.go rename to internal/frontend/serve/rewind.go index 492372620d..b17b91967a 100644 --- a/internal/serve/rewind.go +++ b/internal/frontend/serve/rewind.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "reasonix/internal/checkpoint" - "reasonix/internal/control" + "reasonix/internal/session/control" + "reasonix/internal/state/checkpoint" ) // A rewind is two calls when the plan needs consent: POST /rewind refuses a diff --git a/internal/serve/roles.go b/internal/frontend/serve/roles.go similarity index 99% rename from internal/serve/roles.go rename to internal/frontend/serve/roles.go index 7748c3417a..0658bbaefb 100644 --- a/internal/serve/roles.go +++ b/internal/frontend/serve/roles.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // roleFields maps a wire name onto the AgentConfig field that already decides diff --git a/internal/serve/roles_test.go b/internal/frontend/serve/roles_test.go similarity index 99% rename from internal/serve/roles_test.go rename to internal/frontend/serve/roles_test.go index 7f1e6ed889..95b15a1fc4 100644 --- a/internal/serve/roles_test.go +++ b/internal/frontend/serve/roles_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func readRoles(t *testing.T, base string) map[string]string { diff --git a/internal/serve/route_parity_test.go b/internal/frontend/serve/route_parity_test.go similarity index 98% rename from internal/serve/route_parity_test.go rename to internal/frontend/serve/route_parity_test.go index 9a483b9b05..68eb134346 100644 --- a/internal/serve/route_parity_test.go +++ b/internal/frontend/serve/route_parity_test.go @@ -17,7 +17,7 @@ import ( // therefore answers with HTML where JSON belongs, which is indistinguishable // from a broken endpoint — and only in `vite dev`, so tests and production // stay green while the thing a developer is looking at does not work. -const viteConfig = "../../desktop/frontend-next/vite.config.ts" +const viteConfig = "../../../desktop/frontend-next/vite.config.ts" var routesArray = regexp.MustCompile(`(?s)const ROUTES = \[(.*?)\]`) diff --git a/internal/serve/routes.go b/internal/frontend/serve/routes.go similarity index 100% rename from internal/serve/routes.go rename to internal/frontend/serve/routes.go diff --git a/internal/serve/serve.go b/internal/frontend/serve/serve.go similarity index 99% rename from internal/serve/serve.go rename to internal/frontend/serve/serve.go index 80620d4fb8..e7e1b940ec 100644 --- a/internal/serve/serve.go +++ b/internal/frontend/serve/serve.go @@ -20,17 +20,17 @@ import ( "sync" "time" - "reasonix/internal/agent" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/jobs" - "reasonix/internal/nilutil" - "reasonix/internal/provider" - "reasonix/internal/stats" - "reasonix/internal/store" - "reasonix/internal/surface" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" + "reasonix/internal/session/control" + "reasonix/internal/state/stats" + "reasonix/internal/state/store" ) //go:embed logo-wordmark.svg diff --git a/internal/serve/serve_lease_test.go b/internal/frontend/serve/serve_lease_test.go similarity index 98% rename from internal/serve/serve_lease_test.go rename to internal/frontend/serve/serve_lease_test.go index b80f1a046f..3fadb65c42 100644 --- a/internal/serve/serve_lease_test.go +++ b/internal/frontend/serve/serve_lease_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) func saveServeTestSession(t *testing.T, path string) { diff --git a/internal/serve/serve_lock_test.go b/internal/frontend/serve/serve_lock_test.go similarity index 98% rename from internal/serve/serve_lock_test.go rename to internal/frontend/serve/serve_lock_test.go index 1a11129a06..4dd9cdcaf3 100644 --- a/internal/serve/serve_lock_test.go +++ b/internal/frontend/serve/serve_lock_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/jobs" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/jobs" + "reasonix/internal/session/control" ) // lockProbeController wraps a real controller but intercepts the two blocking diff --git a/internal/serve/serve_portfile_test.go b/internal/frontend/serve/serve_portfile_test.go similarity index 95% rename from internal/serve/serve_portfile_test.go rename to internal/frontend/serve/serve_portfile_test.go index 65f7fa063e..f03dbcb61d 100644 --- a/internal/serve/serve_portfile_test.go +++ b/internal/frontend/serve/serve_portfile_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) func newListenerTestServer(t *testing.T) *Server { diff --git a/internal/serve/serve_test.go b/internal/frontend/serve/serve_test.go similarity index 99% rename from internal/serve/serve_test.go rename to internal/frontend/serve/serve_test.go index 820afb7bc8..d84da29cc9 100644 --- a/internal/serve/serve_test.go +++ b/internal/frontend/serve/serve_test.go @@ -14,16 +14,16 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/jobs" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" + "reasonix/internal/safety/permission" + "reasonix/internal/session/control" ) func TestTitlePromptRequiresUserMessageLanguage(t *testing.T) { diff --git a/internal/serve/session_files_partial_test.go b/internal/frontend/serve/session_files_partial_test.go similarity index 95% rename from internal/serve/session_files_partial_test.go rename to internal/frontend/serve/session_files_partial_test.go index bf51d7001e..6facc28994 100644 --- a/internal/serve/session_files_partial_test.go +++ b/internal/frontend/serve/session_files_partial_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) // A delete that cannot finish must still be one act. Windows briefly refuses to diff --git a/internal/serve/session_files_test.go b/internal/frontend/serve/session_files_test.go similarity index 89% rename from internal/serve/session_files_test.go rename to internal/frontend/serve/session_files_test.go index fd85bdfb3b..05e06351f6 100644 --- a/internal/serve/session_files_test.go +++ b/internal/frontend/serve/session_files_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) func TestRemoveSessionFilesSweepsEventLogAndSidecars(t *testing.T) { diff --git a/internal/serve/session_write_authority.go b/internal/frontend/serve/session_write_authority.go similarity index 97% rename from internal/serve/session_write_authority.go rename to internal/frontend/serve/session_write_authority.go index 90e221c493..42b436eda7 100644 --- a/internal/serve/session_write_authority.go +++ b/internal/frontend/serve/session_write_authority.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/control" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // SetSessionLeases hands the server the session-lease keeper that guards its diff --git a/internal/serve/sessions_current_test.go b/internal/frontend/serve/sessions_current_test.go similarity index 94% rename from internal/serve/sessions_current_test.go rename to internal/frontend/serve/sessions_current_test.go index 2f09a807fe..9221b20346 100644 --- a/internal/serve/sessions_current_test.go +++ b/internal/frontend/serve/sessions_current_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // The same session file reaches the two endpoints spelled differently: the diff --git a/internal/serve/sessions_recovery.go b/internal/frontend/serve/sessions_recovery.go similarity index 98% rename from internal/serve/sessions_recovery.go rename to internal/frontend/serve/sessions_recovery.go index 8366aa8153..aa56dfc1f7 100644 --- a/internal/serve/sessions_recovery.go +++ b/internal/frontend/serve/sessions_recovery.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // recoveryGCInterval bounds how often the background sweep repeats after the diff --git a/internal/serve/sessions_recovery_test.go b/internal/frontend/serve/sessions_recovery_test.go similarity index 94% rename from internal/serve/sessions_recovery_test.go rename to internal/frontend/serve/sessions_recovery_test.go index 72889234bc..2bbeb79c38 100644 --- a/internal/serve/sessions_recovery_test.go +++ b/internal/frontend/serve/sessions_recovery_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // Each fork carries a different prefix of the parent, so both stay covered by diff --git a/internal/serve/sessions_sidecar_test.go b/internal/frontend/serve/sessions_sidecar_test.go similarity index 91% rename from internal/serve/sessions_sidecar_test.go rename to internal/frontend/serve/sessions_sidecar_test.go index 4434e3d1fd..cdc58c3a3d 100644 --- a/internal/serve/sessions_sidecar_test.go +++ b/internal/frontend/serve/sessions_sidecar_test.go @@ -8,11 +8,11 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // GET /sessions must answer from the session sidecars. Decoding each transcript diff --git a/internal/serve/sessions_visibility_test.go b/internal/frontend/serve/sessions_visibility_test.go similarity index 96% rename from internal/serve/sessions_visibility_test.go rename to internal/frontend/serve/sessions_visibility_test.go index fc9b3061b2..2d92df96ff 100644 --- a/internal/serve/sessions_visibility_test.go +++ b/internal/frontend/serve/sessions_visibility_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) func listSessionNames(t *testing.T, ctrl *control.Controller) []string { diff --git a/internal/serve/settings.go b/internal/frontend/serve/settings.go similarity index 98% rename from internal/serve/settings.go rename to internal/frontend/serve/settings.go index 2588d63ef0..f4f75d705a 100644 --- a/internal/serve/settings.go +++ b/internal/frontend/serve/settings.go @@ -6,11 +6,11 @@ import ( "net/http" "strings" - "reasonix/internal/agentpreset" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/planmode" - "reasonix/internal/provider" + "reasonix/internal/contract/agentpreset" + "reasonix/internal/contract/config" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) func (s *Server) preset(w http.ResponseWriter, r *http.Request) { diff --git a/internal/serve/shell.go b/internal/frontend/serve/shell.go similarity index 100% rename from internal/serve/shell.go rename to internal/frontend/serve/shell.go diff --git a/internal/serve/shell_test.go b/internal/frontend/serve/shell_test.go similarity index 97% rename from internal/serve/shell_test.go rename to internal/frontend/serve/shell_test.go index b88f7648ac..1e6204f835 100644 --- a/internal/serve/shell_test.go +++ b/internal/frontend/serve/shell_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) func readShell(t *testing.T, base string) control.ShellSettings { diff --git a/internal/serve/storage.go b/internal/frontend/serve/storage.go similarity index 99% rename from internal/serve/storage.go rename to internal/frontend/serve/storage.go index c5857ad71d..f10bbb003b 100644 --- a/internal/serve/storage.go +++ b/internal/frontend/serve/storage.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "reasonix/internal/config" - "reasonix/internal/storage" + "reasonix/internal/contract/config" + "reasonix/internal/state/storage" ) // storageRoot is one root as the panel reads it. Sizes are the measured ones; diff --git a/internal/serve/storage_test.go b/internal/frontend/serve/storage_test.go similarity index 98% rename from internal/serve/storage_test.go rename to internal/frontend/serve/storage_test.go index 3ffab114a2..8bcb33c9a9 100644 --- a/internal/serve/storage_test.go +++ b/internal/frontend/serve/storage_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func readStorage(t *testing.T, base string) map[string]any { diff --git a/internal/serve/studio_version.go b/internal/frontend/serve/studio_version.go similarity index 98% rename from internal/serve/studio_version.go rename to internal/frontend/serve/studio_version.go index d8d5ca3050..e3d7010760 100644 --- a/internal/serve/studio_version.go +++ b/internal/frontend/serve/studio_version.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) // codeNoInstall answers a version route on a kernel nothing declared an install diff --git a/internal/serve/studio_version_test.go b/internal/frontend/serve/studio_version_test.go similarity index 97% rename from internal/serve/studio_version_test.go rename to internal/frontend/serve/studio_version_test.go index 679523febb..ca1cf13b1b 100644 --- a/internal/serve/studio_version_test.go +++ b/internal/frontend/serve/studio_version_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" - "reasonix/internal/update" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/platform/update" ) func studioServer(t *testing.T, in *update.Install) *httptest.Server { diff --git a/internal/serve/submit_authority_test.go b/internal/frontend/serve/submit_authority_test.go similarity index 91% rename from internal/serve/submit_authority_test.go rename to internal/frontend/serve/submit_authority_test.go index 9685d1669a..beb3112abe 100644 --- a/internal/serve/submit_authority_test.go +++ b/internal/frontend/serve/submit_authority_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // A pane that opens without a transcript mints one on its first turn. The lease diff --git a/internal/serve/surfaces.go b/internal/frontend/serve/surfaces.go similarity index 98% rename from internal/serve/surfaces.go rename to internal/frontend/serve/surfaces.go index 00fa0fd719..30f8215003 100644 --- a/internal/serve/surfaces.go +++ b/internal/frontend/serve/surfaces.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // An extension asks for a place and the frontend offers a default; this is the diff --git a/internal/serve/surfaces_test.go b/internal/frontend/serve/surfaces_test.go similarity index 97% rename from internal/serve/surfaces_test.go rename to internal/frontend/serve/surfaces_test.go index b03f3bbd8f..f09384be9c 100644 --- a/internal/serve/surfaces_test.go +++ b/internal/frontend/serve/surfaces_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func surfaceServer(t *testing.T) string { diff --git a/internal/serve/switch_axes_test.go b/internal/frontend/serve/switch_axes_test.go similarity index 97% rename from internal/serve/switch_axes_test.go rename to internal/frontend/serve/switch_axes_test.go index 6a0d81ea40..0de20f603b 100644 --- a/internal/serve/switch_axes_test.go +++ b/internal/frontend/serve/switch_axes_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/control" + "reasonix/internal/session/control" ) // A model or effort switch rebuilds the runtime, and serve used to re-apply diff --git a/internal/serve/switch_recovery_test.go b/internal/frontend/serve/switch_recovery_test.go similarity index 98% rename from internal/serve/switch_recovery_test.go rename to internal/frontend/serve/switch_recovery_test.go index db2cdf6299..9d3dbc9c1a 100644 --- a/internal/serve/switch_recovery_test.go +++ b/internal/frontend/serve/switch_recovery_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" + "reasonix/internal/state/store" ) type switchAskProvider struct { diff --git a/internal/serve/themes.go b/internal/frontend/serve/themes.go similarity index 98% rename from internal/serve/themes.go rename to internal/frontend/serve/themes.go index a413dc95e0..c28ef0e2e7 100644 --- a/internal/serve/themes.go +++ b/internal/frontend/serve/themes.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "reasonix/internal/config" - "reasonix/internal/theme" + "reasonix/internal/contract/config" + "reasonix/internal/ext/theme" ) func (s *Server) registerThemeRoutes(mux *http.ServeMux) { diff --git a/internal/serve/themes_test.go b/internal/frontend/serve/themes_test.go similarity index 98% rename from internal/serve/themes_test.go rename to internal/frontend/serve/themes_test.go index fbd11e9a9e..0a84d8f036 100644 --- a/internal/serve/themes_test.go +++ b/internal/frontend/serve/themes_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" - "reasonix/internal/theme" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/ext/theme" ) func installPack(t *testing.T, id, name string) { diff --git a/internal/serve/title_test.go b/internal/frontend/serve/title_test.go similarity index 97% rename from internal/serve/title_test.go rename to internal/frontend/serve/title_test.go index 12d52e8650..eff6af3883 100644 --- a/internal/serve/title_test.go +++ b/internal/frontend/serve/title_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" ) // Generation runs on the filler's goroutines, so the recorder is shared. diff --git a/internal/serve/titlecache.go b/internal/frontend/serve/titlecache.go similarity index 97% rename from internal/serve/titlecache.go rename to internal/frontend/serve/titlecache.go index 88d9eddf56..9c1232ada9 100644 --- a/internal/serve/titlecache.go +++ b/internal/frontend/serve/titlecache.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // titleCache persists generated session titles to /.session-titles.json. diff --git a/internal/serve/titlecache_test.go b/internal/frontend/serve/titlecache_test.go similarity index 98% rename from internal/serve/titlecache_test.go rename to internal/frontend/serve/titlecache_test.go index 70b17e3948..646ee9b0a4 100644 --- a/internal/serve/titlecache_test.go +++ b/internal/frontend/serve/titlecache_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestTitleCacheKeepsTitleAcrossMtimeChanges(t *testing.T) { diff --git a/internal/serve/titlefill.go b/internal/frontend/serve/titlefill.go similarity index 96% rename from internal/serve/titlefill.go rename to internal/frontend/serve/titlefill.go index 4bad619163..773f3c218e 100644 --- a/internal/serve/titlefill.go +++ b/internal/frontend/serve/titlefill.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) // A cold title cache cost one model round-trip per session, serialized inside diff --git a/internal/serve/todos.go b/internal/frontend/serve/todos.go similarity index 100% rename from internal/serve/todos.go rename to internal/frontend/serve/todos.go diff --git a/internal/serve/trace_facts_test.go b/internal/frontend/serve/trace_facts_test.go similarity index 99% rename from internal/serve/trace_facts_test.go rename to internal/frontend/serve/trace_facts_test.go index 2e89d9a5e9..06edcd1fe1 100644 --- a/internal/serve/trace_facts_test.go +++ b/internal/frontend/serve/trace_facts_test.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "reasonix/internal/eventwire" + "reasonix/internal/contract/eventwire" ) // TurnTraceFacts is what a partition would be computed FROM. It holds no diff --git a/internal/serve/trace_fixture_test.go b/internal/frontend/serve/trace_fixture_test.go similarity index 94% rename from internal/serve/trace_fixture_test.go rename to internal/frontend/serve/trace_fixture_test.go index c46e250114..dd4384e733 100644 --- a/internal/serve/trace_fixture_test.go +++ b/internal/frontend/serve/trace_fixture_test.go @@ -8,15 +8,15 @@ import ( "strings" "testing" - "reasonix/internal/control" - "reasonix/internal/eventwire" - "reasonix/internal/provider" + "reasonix/internal/contract/eventwire" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) // traceFixturePath is where the desktop's reducer parity test reads these from. // The frames have to come from the production assembly or that test proves only // that a hand-written array round-trips through a reducer. -const traceFixturePath = "../../desktop/frontend-next/src/e2e/fixtures/trace_readings.json" +const traceFixturePath = "../../../desktop/frontend-next/src/e2e/fixtures/trace_readings.json" // traceFixture is one turn as both readings, with the run-to-run noise removed // so the file is stable enough to commit and diff. @@ -162,6 +162,6 @@ func TestTraceFixturesMatchWhatTheKernelProduces(t *testing.T) { t.Fatalf("the committed readings are not what the kernel produces now.\n" + "The desktop reducer parity test reads them, so a stale file would check\n" + "that reducer against a shape nothing emits. Regenerate with\n" + - " REASONIX_UPDATE_TRACE_FIXTURES=1 go test ./internal/serve/ -run TestTraceFixtures") + " REASONIX_UPDATE_TRACE_FIXTURES=1 go test ./internal/frontend/serve/ -run TestTraceFixtures") } } diff --git a/internal/serve/trace_parity_test.go b/internal/frontend/serve/trace_parity_test.go similarity index 98% rename from internal/serve/trace_parity_test.go rename to internal/frontend/serve/trace_parity_test.go index 6406a93270..d3eee579ea 100644 --- a/internal/serve/trace_parity_test.go +++ b/internal/frontend/serve/trace_parity_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" ) // traceScript is one stubbed model: round i answers with script[i]. It stands diff --git a/internal/serve/tray.go b/internal/frontend/serve/tray.go similarity index 98% rename from internal/serve/tray.go rename to internal/frontend/serve/tray.go index 2e0825d19f..abc3db7386 100644 --- a/internal/serve/tray.go +++ b/internal/frontend/serve/tray.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - "reasonix/internal/config" - "reasonix/internal/i18n" - "reasonix/internal/traystate" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/frontend/traystate" ) // TrayPrefs is what a window can be asked about its own status icon. Icon is diff --git a/internal/serve/tray_test.go b/internal/frontend/serve/tray_test.go similarity index 97% rename from internal/serve/tray_test.go rename to internal/frontend/serve/tray_test.go index 786cdf32e3..c59c756043 100644 --- a/internal/serve/tray_test.go +++ b/internal/frontend/serve/tray_test.go @@ -8,9 +8,9 @@ import ( "sync" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" - "reasonix/internal/traystate" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/frontend/traystate" ) // stubTray stands in for the window. TrayFold counts its own calls into the diff --git a/internal/serve/turn_identity_test.go b/internal/frontend/serve/turn_identity_test.go similarity index 93% rename from internal/serve/turn_identity_test.go rename to internal/frontend/serve/turn_identity_test.go index 5e54d9bc27..6feb672afa 100644 --- a/internal/serve/turn_identity_test.go +++ b/internal/frontend/serve/turn_identity_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/session/control" ) type turnIdentityProvider struct{} diff --git a/internal/serve/update.go b/internal/frontend/serve/update.go similarity index 97% rename from internal/serve/update.go rename to internal/frontend/serve/update.go index 59c5b9621b..dae6160fda 100644 --- a/internal/serve/update.go +++ b/internal/frontend/serve/update.go @@ -5,8 +5,8 @@ import ( "errors" "net/http" - "reasonix/internal/appupdate" - "reasonix/internal/update" + "reasonix/internal/platform/appupdate" + "reasonix/internal/platform/update" ) // UpdateHost is the desktop application this kernel runs inside, as far as the diff --git a/internal/serve/update_test.go b/internal/frontend/serve/update_test.go similarity index 98% rename from internal/serve/update_test.go rename to internal/frontend/serve/update_test.go index 344c02a7dd..74e45e3bf1 100644 --- a/internal/serve/update_test.go +++ b/internal/frontend/serve/update_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/appupdate" - "reasonix/internal/testenv" - "reasonix/internal/update" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/appupdate" + "reasonix/internal/platform/update" ) type stubUpdateHost struct { diff --git a/internal/serve/usage.go b/internal/frontend/serve/usage.go similarity index 95% rename from internal/serve/usage.go rename to internal/frontend/serve/usage.go index 9bf7fdd10d..816a893dd6 100644 --- a/internal/serve/usage.go +++ b/internal/frontend/serve/usage.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "reasonix/internal/config" - "reasonix/internal/stats" + "reasonix/internal/contract/config" + "reasonix/internal/state/stats" ) const ( diff --git a/internal/serve/web_entry_test.go b/internal/frontend/serve/web_entry_test.go similarity index 96% rename from internal/serve/web_entry_test.go rename to internal/frontend/serve/web_entry_test.go index a431a86673..36bbf6bb49 100644 --- a/internal/serve/web_entry_test.go +++ b/internal/frontend/serve/web_entry_test.go @@ -7,8 +7,8 @@ import ( "testing" "testing/fstest" - "reasonix/internal/config" - "reasonix/internal/control" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) func TestServeIndexPageAndSessionDeepLink(t *testing.T) { diff --git a/internal/serve/welcome.go b/internal/frontend/serve/welcome.go similarity index 97% rename from internal/serve/welcome.go rename to internal/frontend/serve/welcome.go index 0d125cd437..6bf47e1ce5 100644 --- a/internal/serve/welcome.go +++ b/internal/frontend/serve/welcome.go @@ -4,7 +4,7 @@ package serve import ( "net/http" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func (s *Server) registerWelcomeRoutes(mux *http.ServeMux) { diff --git a/internal/serve/welcome_test.go b/internal/frontend/serve/welcome_test.go similarity index 97% rename from internal/serve/welcome_test.go rename to internal/frontend/serve/welcome_test.go index 3e644dc268..20a58188ac 100644 --- a/internal/serve/welcome_test.go +++ b/internal/frontend/serve/welcome_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func welcomeSeen(t *testing.T, base string) bool { diff --git a/internal/serve/wirelog.go b/internal/frontend/serve/wirelog.go similarity index 98% rename from internal/serve/wirelog.go rename to internal/frontend/serve/wirelog.go index 5c4debae5b..b82ae93ecf 100644 --- a/internal/serve/wirelog.go +++ b/internal/frontend/serve/wirelog.go @@ -9,13 +9,13 @@ import ( "strings" "sync" - "reasonix/internal/fileutil" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + "reasonix/internal/state/store" ) // The trajectory pane is built from wire frames, so the frames are what gets // kept: replaying them reproduces the pane row for row, with no second schema -// to map through. internal/trajectory records a richer audit stream for offline +// to map through. internal/state/trajectory records a richer audit stream for offline // analysis and answers a different question. const wireLogMaxBytes = 8 << 20 diff --git a/internal/serve/wirelog_coverage_test.go b/internal/frontend/serve/wirelog_coverage_test.go similarity index 96% rename from internal/serve/wirelog_coverage_test.go rename to internal/frontend/serve/wirelog_coverage_test.go index cac0288551..44ba3fbefe 100644 --- a/internal/serve/wirelog_coverage_test.go +++ b/internal/frontend/serve/wirelog_coverage_test.go @@ -3,7 +3,7 @@ package serve import ( "testing" - "reasonix/internal/eventwire" + "reasonix/internal/contract/eventwire" ) // A frame's absence from the log is a decision, and the only way to tell a diff --git a/internal/serve/wirelog_test.go b/internal/frontend/serve/wirelog_test.go similarity index 98% rename from internal/serve/wirelog_test.go rename to internal/frontend/serve/wirelog_test.go index cd28a2df95..bb751f4c39 100644 --- a/internal/serve/wirelog_test.go +++ b/internal/frontend/serve/wirelog_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/control" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/session/control" + "reasonix/internal/state/store" ) // Reconnecting rebuilds the trajectory pane from this log, so every frame the diff --git a/internal/serve/workgroup_semantics_test.go b/internal/frontend/serve/workgroup_semantics_test.go similarity index 98% rename from internal/serve/workgroup_semantics_test.go rename to internal/frontend/serve/workgroup_semantics_test.go index 207b05cd87..d8fd9bf5f8 100644 --- a/internal/serve/workgroup_semantics_test.go +++ b/internal/frontend/serve/workgroup_semantics_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "reasonix/internal/control" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/provider" - "reasonix/internal/workgroup" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/contract/provider" + "reasonix/internal/session/control" + "reasonix/internal/state/workgroup" ) // Falsification, not measurement: each case asks whether a partition is legal diff --git a/internal/serve/workspace.go b/internal/frontend/serve/workspace.go similarity index 98% rename from internal/serve/workspace.go rename to internal/frontend/serve/workspace.go index 30c44d5538..1dad52d579 100644 --- a/internal/serve/workspace.go +++ b/internal/frontend/serve/workspace.go @@ -11,12 +11,12 @@ import ( "slices" "strings" - "reasonix/internal/boot" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/fileutil" - "reasonix/internal/surface" - "reasonix/internal/worktree" + "reasonix/internal/assembly/boot" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" + "reasonix/internal/contract/surface" + "reasonix/internal/platform/worktree" + "reasonix/internal/session/control" ) // workspaceRecentMax bounds the remembered list. It is the sidebar's tree, not diff --git a/internal/serve/workspace_files.go b/internal/frontend/serve/workspace_files.go similarity index 100% rename from internal/serve/workspace_files.go rename to internal/frontend/serve/workspace_files.go diff --git a/internal/serve/workspace_files_test.go b/internal/frontend/serve/workspace_files_test.go similarity index 94% rename from internal/serve/workspace_files_test.go rename to internal/frontend/serve/workspace_files_test.go index d362568553..eec14cfc91 100644 --- a/internal/serve/workspace_files_test.go +++ b/internal/frontend/serve/workspace_files_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) func TestWorkspaceFileEditRequiresTheRevisionItRead(t *testing.T) { diff --git a/internal/serve/workspace_test.go b/internal/frontend/serve/workspace_test.go similarity index 96% rename from internal/serve/workspace_test.go rename to internal/frontend/serve/workspace_test.go index a0725032f4..613df425fd 100644 --- a/internal/serve/workspace_test.go +++ b/internal/frontend/serve/workspace_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/control" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/session/control" ) // A server whose host did not grant the switch must not be repointable, however diff --git a/internal/traystate/traystate.go b/internal/frontend/traystate/traystate.go similarity index 99% rename from internal/traystate/traystate.go rename to internal/frontend/traystate/traystate.go index 2be3803e86..eccb7a5119 100644 --- a/internal/traystate/traystate.go +++ b/internal/frontend/traystate/traystate.go @@ -8,7 +8,7 @@ package traystate import ( "sync" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // Mood is the one thing an icon says at a glance, ranked by what a person has diff --git a/internal/traystate/traystate_test.go b/internal/frontend/traystate/traystate_test.go similarity index 99% rename from internal/traystate/traystate_test.go rename to internal/frontend/traystate/traystate_test.go index 0a3ab47dd1..bf23e26a26 100644 --- a/internal/traystate/traystate_test.go +++ b/internal/frontend/traystate/traystate_test.go @@ -5,7 +5,7 @@ import ( "sync" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) func emit(sink event.Sink, kinds ...event.Kind) { diff --git a/internal/provider/anthropic/anthropic.go b/internal/model/anthropic/anthropic.go similarity index 99% rename from internal/provider/anthropic/anthropic.go rename to internal/model/anthropic/anthropic.go index 663f2c2e32..7cf85e3709 100644 --- a/internal/provider/anthropic/anthropic.go +++ b/internal/model/anthropic/anthropic.go @@ -33,9 +33,9 @@ import ( "sync/atomic" "time" - "reasonix/internal/netclient" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/provider" + "reasonix/internal/model/openai" ) // defaultStreamIdleTimeout caps how long a started SSE stream may go silent before diff --git a/internal/provider/anthropic/anthropic_test.go b/internal/model/anthropic/anthropic_test.go similarity index 99% rename from internal/provider/anthropic/anthropic_test.go rename to internal/model/anthropic/anthropic_test.go index 5257d7c9a0..eeab0cd6dd 100644 --- a/internal/provider/anthropic/anthropic_test.go +++ b/internal/model/anthropic/anthropic_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestBuildRequest covers the protocol conversion: system lift, tool_use / diff --git a/internal/provider/anthropic/image_test.go b/internal/model/anthropic/image_test.go similarity index 99% rename from internal/provider/anthropic/image_test.go rename to internal/model/anthropic/image_test.go index 21fd2e01cb..b3a5a9bca0 100644 --- a/internal/provider/anthropic/image_test.go +++ b/internal/model/anthropic/image_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestBuildRequestEmbedsImageBlockForVisionModel(t *testing.T) { diff --git a/internal/provider/anthropic/output_budget.go b/internal/model/anthropic/output_budget.go similarity index 100% rename from internal/provider/anthropic/output_budget.go rename to internal/model/anthropic/output_budget.go diff --git a/internal/provider/anthropic/output_budget_test.go b/internal/model/anthropic/output_budget_test.go similarity index 100% rename from internal/provider/anthropic/output_budget_test.go rename to internal/model/anthropic/output_budget_test.go diff --git a/internal/provider/anthropic/realdeepseek_test.go b/internal/model/anthropic/realdeepseek_test.go similarity index 99% rename from internal/provider/anthropic/realdeepseek_test.go rename to internal/model/anthropic/realdeepseek_test.go index 2f46f43c78..e2b7bce16b 100644 --- a/internal/provider/anthropic/realdeepseek_test.go +++ b/internal/model/anthropic/realdeepseek_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestRealOpenCodeGoDeepSeekAnthropicWebSearch exercises Reasonix's complete diff --git a/internal/provider/anthropic/realyyds_test.go b/internal/model/anthropic/realyyds_test.go similarity index 98% rename from internal/provider/anthropic/realyyds_test.go rename to internal/model/anthropic/realyyds_test.go index 5648a1fcb4..392e2adc8b 100644 --- a/internal/provider/anthropic/realyyds_test.go +++ b/internal/model/anthropic/realyyds_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestRealYYDSAnthropicPromptCache pins the reason yyds-anthropic exists. diff --git a/internal/provider/anthropic/reasoning.go b/internal/model/anthropic/reasoning.go similarity index 98% rename from internal/provider/anthropic/reasoning.go rename to internal/model/anthropic/reasoning.go index e302742005..c445dfc737 100644 --- a/internal/provider/anthropic/reasoning.go +++ b/internal/model/anthropic/reasoning.go @@ -4,8 +4,8 @@ package anthropic import ( "strings" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" + "reasonix/internal/contract/provider" + "reasonix/internal/model/openai" ) // reasoningProtocolAnthropic is the config-declared name for Anthropic's own diff --git a/internal/provider/anthropic/reasoning_replay_test.go b/internal/model/anthropic/reasoning_replay_test.go similarity index 98% rename from internal/provider/anthropic/reasoning_replay_test.go rename to internal/model/anthropic/reasoning_replay_test.go index 1f687e2df3..e823c77dda 100644 --- a/internal/provider/anthropic/reasoning_replay_test.go +++ b/internal/model/anthropic/reasoning_replay_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func relayClient(t *testing.T, base string, extra map[string]any) *client { diff --git a/internal/provider/anthropic/request_url_test.go b/internal/model/anthropic/request_url_test.go similarity index 97% rename from internal/provider/anthropic/request_url_test.go rename to internal/model/anthropic/request_url_test.go index e8b5650686..cc33036a1c 100644 --- a/internal/provider/anthropic/request_url_test.go +++ b/internal/model/anthropic/request_url_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestStreamUsesConfiguredRequestURLExactly(t *testing.T) { diff --git a/internal/provider/anthropic/stall_test.go b/internal/model/anthropic/stall_test.go similarity index 98% rename from internal/provider/anthropic/stall_test.go rename to internal/model/anthropic/stall_test.go index 7d339c540a..a96f8c5441 100644 --- a/internal/provider/anthropic/stall_test.go +++ b/internal/model/anthropic/stall_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestStreamStallTimesOut covers issue #3374 for the Anthropic provider: a diff --git a/internal/provider/anthropic/stream_error.go b/internal/model/anthropic/stream_error.go similarity index 89% rename from internal/provider/anthropic/stream_error.go rename to internal/model/anthropic/stream_error.go index 555d9643fd..0eec6f89ee 100644 --- a/internal/provider/anthropic/stream_error.go +++ b/internal/model/anthropic/stream_error.go @@ -1,6 +1,6 @@ package anthropic -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" type streamWireError struct { Type string `json:"type"` diff --git a/internal/provider/anthropic/tool_execution_wire_test.go b/internal/model/anthropic/tool_execution_wire_test.go similarity index 98% rename from internal/provider/anthropic/tool_execution_wire_test.go rename to internal/model/anthropic/tool_execution_wire_test.go index 3026bf2aba..40ed7ea114 100644 --- a/internal/provider/anthropic/tool_execution_wire_test.go +++ b/internal/model/anthropic/tool_execution_wire_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestBuildRequestExcludesToolExecution(t *testing.T) { diff --git a/internal/provider/anthropic/web_search.go b/internal/model/anthropic/web_search.go similarity index 98% rename from internal/provider/anthropic/web_search.go rename to internal/model/anthropic/web_search.go index 3f304564fe..a8ad246beb 100644 --- a/internal/provider/anthropic/web_search.go +++ b/internal/model/anthropic/web_search.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // The Messages API can run web_search itself: the query arrives as a diff --git a/internal/provider/anthropic/web_search_test.go b/internal/model/anthropic/web_search_test.go similarity index 99% rename from internal/provider/anthropic/web_search_test.go rename to internal/model/anthropic/web_search_test.go index aa9854a62d..82578f1fa0 100644 --- a/internal/provider/anthropic/web_search_test.go +++ b/internal/model/anthropic/web_search_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestBuildRequestWebSearchServerTool covers the tools-array shape when the diff --git a/internal/billing/balance.go b/internal/model/billing/balance.go similarity index 100% rename from internal/billing/balance.go rename to internal/model/billing/balance.go diff --git a/internal/billing/balance_extra_test.go b/internal/model/billing/balance_extra_test.go similarity index 100% rename from internal/billing/balance_extra_test.go rename to internal/model/billing/balance_extra_test.go diff --git a/internal/billing/balance_test.go b/internal/model/billing/balance_test.go similarity index 100% rename from internal/billing/balance_test.go rename to internal/model/billing/balance_test.go diff --git a/internal/billing/cache.go b/internal/model/billing/cache.go similarity index 100% rename from internal/billing/cache.go rename to internal/model/billing/cache.go diff --git a/internal/billing/cache_test.go b/internal/model/billing/cache_test.go similarity index 100% rename from internal/billing/cache_test.go rename to internal/model/billing/cache_test.go diff --git a/internal/billing/catalog.go b/internal/model/billing/catalog.go similarity index 100% rename from internal/billing/catalog.go rename to internal/model/billing/catalog.go diff --git a/internal/billing/catalog_test.go b/internal/model/billing/catalog_test.go similarity index 100% rename from internal/billing/catalog_test.go rename to internal/model/billing/catalog_test.go diff --git a/internal/billing/coverage.go b/internal/model/billing/coverage.go similarity index 100% rename from internal/billing/coverage.go rename to internal/model/billing/coverage.go diff --git a/internal/billing/coverage_test.go b/internal/model/billing/coverage_test.go similarity index 100% rename from internal/billing/coverage_test.go rename to internal/model/billing/coverage_test.go diff --git a/internal/billing/ledger.go b/internal/model/billing/ledger.go similarity index 100% rename from internal/billing/ledger.go rename to internal/model/billing/ledger.go diff --git a/internal/billing/migrate.go b/internal/model/billing/migrate.go similarity index 100% rename from internal/billing/migrate.go rename to internal/model/billing/migrate.go diff --git a/internal/billing/migrate_test.go b/internal/model/billing/migrate_test.go similarity index 100% rename from internal/billing/migrate_test.go rename to internal/model/billing/migrate_test.go diff --git a/internal/billing/money.go b/internal/model/billing/money.go similarity index 100% rename from internal/billing/money.go rename to internal/model/billing/money.go diff --git a/internal/billing/money_test.go b/internal/model/billing/money_test.go similarity index 100% rename from internal/billing/money_test.go rename to internal/model/billing/money_test.go diff --git a/internal/billing/quote.go b/internal/model/billing/quote.go similarity index 100% rename from internal/billing/quote.go rename to internal/model/billing/quote.go diff --git a/internal/billing/quote_test.go b/internal/model/billing/quote_test.go similarity index 100% rename from internal/billing/quote_test.go rename to internal/model/billing/quote_test.go diff --git a/internal/billing/rates.go b/internal/model/billing/rates.go similarity index 100% rename from internal/billing/rates.go rename to internal/model/billing/rates.go diff --git a/internal/billing/rates_test.go b/internal/model/billing/rates_test.go similarity index 100% rename from internal/billing/rates_test.go rename to internal/model/billing/rates_test.go diff --git a/internal/billing/shape.go b/internal/model/billing/shape.go similarity index 100% rename from internal/billing/shape.go rename to internal/model/billing/shape.go diff --git a/internal/billing/shape_test.go b/internal/model/billing/shape_test.go similarity index 100% rename from internal/billing/shape_test.go rename to internal/model/billing/shape_test.go diff --git a/internal/billing/window.go b/internal/model/billing/window.go similarity index 100% rename from internal/billing/window.go rename to internal/model/billing/window.go diff --git a/internal/billing/window_test.go b/internal/model/billing/window_test.go similarity index 100% rename from internal/billing/window_test.go rename to internal/model/billing/window_test.go diff --git a/internal/boundedllm/bounded.go b/internal/model/boundedllm/bounded.go similarity index 97% rename from internal/boundedllm/bounded.go rename to internal/model/boundedllm/bounded.go index dd5fdab836..a9eb50150d 100644 --- a/internal/boundedllm/bounded.go +++ b/internal/model/boundedllm/bounded.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "reasonix/internal/event" - "reasonix/internal/nilutil" - "reasonix/internal/provider" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) const ( diff --git a/internal/laya/client.go b/internal/model/laya/client.go similarity index 98% rename from internal/laya/client.go rename to internal/model/laya/client.go index ac919c1cd2..e3d397f36f 100644 --- a/internal/laya/client.go +++ b/internal/model/laya/client.go @@ -12,7 +12,7 @@ import ( "os/exec" "strings" - "reasonix/internal/typesafe" + "reasonix/internal/safety/typesafe" ) const resultMarker = "__REASONIX_LAYA_RESULT__" diff --git a/internal/provider/openai/downgrade.go b/internal/model/openai/downgrade.go similarity index 98% rename from internal/provider/openai/downgrade.go rename to internal/model/openai/downgrade.go index c94ec26bc0..b413dffc9b 100644 --- a/internal/provider/openai/downgrade.go +++ b/internal/model/openai/downgrade.go @@ -6,7 +6,7 @@ import ( "net/http" "sync/atomic" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // endpointFacts are what requests to this endpoint have established, each diff --git a/internal/provider/openai/effort.go b/internal/model/openai/effort.go similarity index 98% rename from internal/provider/openai/effort.go rename to internal/model/openai/effort.go index c91bc7430f..eb28013cf2 100644 --- a/internal/provider/openai/effort.go +++ b/internal/model/openai/effort.go @@ -5,7 +5,7 @@ package openai import ( "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // configuredThinkingType reads the optional explicit `thinking` config field — diff --git a/internal/provider/openai/effort_declared_test.go b/internal/model/openai/effort_declared_test.go similarity index 98% rename from internal/provider/openai/effort_declared_test.go rename to internal/model/openai/effort_declared_test.go index 55980c8263..a4e7fc6fb5 100644 --- a/internal/provider/openai/effort_declared_test.go +++ b/internal/model/openai/effort_declared_test.go @@ -3,7 +3,7 @@ package openai import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // A third-party endpoint can serve a DeepSeek model under its own effort scale. diff --git a/internal/provider/openai/effort_override_test.go b/internal/model/openai/effort_override_test.go similarity index 98% rename from internal/provider/openai/effort_override_test.go rename to internal/model/openai/effort_override_test.go index 913f6860bf..6aeab2ef13 100644 --- a/internal/provider/openai/effort_override_test.go +++ b/internal/model/openai/effort_override_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func newTestClient(t *testing.T, model string, extra map[string]any) *client { diff --git a/internal/provider/openai/effort_test.go b/internal/model/openai/effort_test.go similarity index 99% rename from internal/provider/openai/effort_test.go rename to internal/model/openai/effort_test.go index 29db59828f..5efa466ea4 100644 --- a/internal/provider/openai/effort_test.go +++ b/internal/model/openai/effort_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func newClient(t *testing.T, baseURL, effort string) *client { diff --git a/internal/provider/openai/empty_stream_test.go b/internal/model/openai/empty_stream_test.go similarity index 98% rename from internal/provider/openai/empty_stream_test.go rename to internal/model/openai/empty_stream_test.go index e18271180f..b36318fa11 100644 --- a/internal/provider/openai/empty_stream_test.go +++ b/internal/model/openai/empty_stream_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // A gateway can answer 200, hold the stream open long enough to look healthy, diff --git a/internal/provider/openai/fetch_models.go b/internal/model/openai/fetch_models.go similarity index 100% rename from internal/provider/openai/fetch_models.go rename to internal/model/openai/fetch_models.go diff --git a/internal/provider/openai/fetch_models_test.go b/internal/model/openai/fetch_models_test.go similarity index 100% rename from internal/provider/openai/fetch_models_test.go rename to internal/model/openai/fetch_models_test.go diff --git a/internal/provider/openai/h2_reset_test.go b/internal/model/openai/h2_reset_test.go similarity index 98% rename from internal/provider/openai/h2_reset_test.go rename to internal/model/openai/h2_reset_test.go index c8c55fab7b..be69bca5ea 100644 --- a/internal/provider/openai/h2_reset_test.go +++ b/internal/model/openai/h2_reset_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // Issue #9389: a gateway resets the HTTP/2 stream after it has already streamed diff --git a/internal/provider/openai/host.go b/internal/model/openai/host.go similarity index 99% rename from internal/provider/openai/host.go rename to internal/model/openai/host.go index 7b81296ae8..d66021b775 100644 --- a/internal/provider/openai/host.go +++ b/internal/model/openai/host.go @@ -5,7 +5,7 @@ import ( "slices" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // matchesVendorHost reports whether baseURL points at one of the canonical diff --git a/internal/provider/openai/host_test.go b/internal/model/openai/host_test.go similarity index 100% rename from internal/provider/openai/host_test.go rename to internal/model/openai/host_test.go diff --git a/internal/provider/openai/image_test.go b/internal/model/openai/image_test.go similarity index 99% rename from internal/provider/openai/image_test.go rename to internal/model/openai/image_test.go index 68a3963136..7803692665 100644 --- a/internal/provider/openai/image_test.go +++ b/internal/model/openai/image_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestBuildRequestEmbedsImagesForVisionModel(t *testing.T) { diff --git a/internal/provider/openai/keyrotation_test.go b/internal/model/openai/keyrotation_test.go similarity index 98% rename from internal/provider/openai/keyrotation_test.go rename to internal/model/openai/keyrotation_test.go index 7bc19bdd57..ded5e76559 100644 --- a/internal/provider/openai/keyrotation_test.go +++ b/internal/model/openai/keyrotation_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // A key is external mutable state: an exhausted one gets replaced while the diff --git a/internal/provider/openai/kimi_k3.go b/internal/model/openai/kimi_k3.go similarity index 100% rename from internal/provider/openai/kimi_k3.go rename to internal/model/openai/kimi_k3.go diff --git a/internal/provider/openai/kimi_k3_test.go b/internal/model/openai/kimi_k3_test.go similarity index 98% rename from internal/provider/openai/kimi_k3_test.go rename to internal/model/openai/kimi_k3_test.go index 5854b8b970..9a1a83ae80 100644 --- a/internal/provider/openai/kimi_k3_test.go +++ b/internal/model/openai/kimi_k3_test.go @@ -3,7 +3,7 @@ package openai import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestExplicitKimiK3GatewayRequestContract(t *testing.T) { diff --git a/internal/provider/openai/lifecycle.go b/internal/model/openai/lifecycle.go similarity index 100% rename from internal/provider/openai/lifecycle.go rename to internal/model/openai/lifecycle.go diff --git a/internal/provider/openai/openai.go b/internal/model/openai/openai.go similarity index 99% rename from internal/provider/openai/openai.go rename to internal/model/openai/openai.go index 6e7aaff6f7..f4f3d205b0 100644 --- a/internal/provider/openai/openai.go +++ b/internal/model/openai/openai.go @@ -34,8 +34,8 @@ import ( "sync/atomic" "time" - "reasonix/internal/netclient" - "reasonix/internal/provider" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/provider" ) // defaultStreamIdleTimeout caps how long a started SSE stream may go without any diff --git a/internal/provider/openai/openai_test.go b/internal/model/openai/openai_test.go similarity index 99% rename from internal/provider/openai/openai_test.go rename to internal/model/openai/openai_test.go index a5511e031b..3c7ffbb610 100644 --- a/internal/provider/openai/openai_test.go +++ b/internal/model/openai/openai_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestStreamRetriesThenSucceeds drives the real retry path end-to-end: the diff --git a/internal/provider/openai/output_budget.go b/internal/model/openai/output_budget.go similarity index 100% rename from internal/provider/openai/output_budget.go rename to internal/model/openai/output_budget.go diff --git a/internal/provider/openai/output_budget_test.go b/internal/model/openai/output_budget_test.go similarity index 100% rename from internal/provider/openai/output_budget_test.go rename to internal/model/openai/output_budget_test.go diff --git a/internal/provider/openai/realcache_test.go b/internal/model/openai/realcache_test.go similarity index 98% rename from internal/provider/openai/realcache_test.go rename to internal/model/openai/realcache_test.go index e1d6dd6b78..c65456ecb8 100644 --- a/internal/provider/openai/realcache_test.go +++ b/internal/model/openai/realcache_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // probeResult captures the cache-relevant numbers from one real completion. @@ -29,7 +29,7 @@ type probeResult struct { // 3. how much does DeepSeek's required tool-call reasoning replay add to // prompt_tokens, and does the replayed prefix still receive cache hits. // -// Run with: set -a; source .env; set +a; go test -tags live ./internal/provider/openai/ -run TestRealDeepSeekCacheProbe -v -count=1 +// Run with: set -a; source .env; set +a; go test -tags live ./internal/model/openai/ -run TestRealDeepSeekCacheProbe -v -count=1 func TestRealDeepSeekCacheProbe(t *testing.T) { key := os.Getenv("DEEPSEEK_API_KEY") if key == "" { diff --git a/internal/provider/openai/reasoning_replay.go b/internal/model/openai/reasoning_replay.go similarity index 97% rename from internal/provider/openai/reasoning_replay.go rename to internal/model/openai/reasoning_replay.go index 424540af0d..af5cb896ed 100644 --- a/internal/provider/openai/reasoning_replay.go +++ b/internal/model/openai/reasoning_replay.go @@ -1,6 +1,6 @@ package openai -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // toolCallReasoning returns the reasoning_content to serialize on m, and whether // this turn's reasoning was left behind instead. One function, so the wire diff --git a/internal/provider/openai/reasoning_replay_test.go b/internal/model/openai/reasoning_replay_test.go similarity index 98% rename from internal/provider/openai/reasoning_replay_test.go rename to internal/model/openai/reasoning_replay_test.go index 279da63a7d..87088dfd6f 100644 --- a/internal/provider/openai/reasoning_replay_test.go +++ b/internal/model/openai/reasoning_replay_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func relayClient(t *testing.T, extra map[string]any) *client { diff --git a/internal/provider/openai/reconnect_test.go b/internal/model/openai/reconnect_test.go similarity index 99% rename from internal/provider/openai/reconnect_test.go rename to internal/model/openai/reconnect_test.go index 0b5710602f..2b18e001ef 100644 --- a/internal/provider/openai/reconnect_test.go +++ b/internal/model/openai/reconnect_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // rstAfter writes a 200 SSE head plus the given prelude, then forces a TCP RST diff --git a/internal/provider/openai/request_url_test.go b/internal/model/openai/request_url_test.go similarity index 93% rename from internal/provider/openai/request_url_test.go rename to internal/model/openai/request_url_test.go index 56132ef1f4..bd25eb23fa 100644 --- a/internal/provider/openai/request_url_test.go +++ b/internal/model/openai/request_url_test.go @@ -3,7 +3,7 @@ package openai import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestNewPrefersExactRequestURLOverLegacyChatURL(t *testing.T) { diff --git a/internal/provider/openai/stall_recover_test.go b/internal/model/openai/stall_recover_test.go similarity index 98% rename from internal/provider/openai/stall_recover_test.go rename to internal/model/openai/stall_recover_test.go index 6cf33bd32b..e9110d13c2 100644 --- a/internal/provider/openai/stall_recover_test.go +++ b/internal/model/openai/stall_recover_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestStreamStallSurfacesAsInterrupt exercises the watchdog's primary target: diff --git a/internal/provider/openai/stall_test.go b/internal/model/openai/stall_test.go similarity index 98% rename from internal/provider/openai/stall_test.go rename to internal/model/openai/stall_test.go index 2ff9c8af45..3c32ab60e0 100644 --- a/internal/provider/openai/stall_test.go +++ b/internal/model/openai/stall_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestStreamStallTimesOut covers issue #3374: a half-open connection (a proxy diff --git a/internal/provider/openai/stream_error.go b/internal/model/openai/stream_error.go similarity index 100% rename from internal/provider/openai/stream_error.go rename to internal/model/openai/stream_error.go diff --git a/internal/provider/openai/stream_failure.go b/internal/model/openai/stream_failure.go similarity index 97% rename from internal/provider/openai/stream_failure.go rename to internal/model/openai/stream_failure.go index 0673f9a2d6..f314f77c98 100644 --- a/internal/provider/openai/stream_failure.go +++ b/internal/model/openai/stream_failure.go @@ -8,8 +8,8 @@ import ( "io" "time" - "reasonix/internal/neterr" - "reasonix/internal/provider" + "reasonix/internal/base/neterr" + "reasonix/internal/contract/provider" ) // errEmptyStream: a stream that ended cleanly having carried nothing at all — diff --git a/internal/provider/openai/stream_payload_error_test.go b/internal/model/openai/stream_payload_error_test.go similarity index 98% rename from internal/provider/openai/stream_payload_error_test.go rename to internal/model/openai/stream_payload_error_test.go index fa8416e6c1..bbba03219e 100644 --- a/internal/provider/openai/stream_payload_error_test.go +++ b/internal/model/openai/stream_payload_error_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // sseServer answers one streaming request with the given SSE frames. diff --git a/internal/provider/openai/think.go b/internal/model/openai/think.go similarity index 100% rename from internal/provider/openai/think.go rename to internal/model/openai/think.go diff --git a/internal/provider/openai/think_test.go b/internal/model/openai/think_test.go similarity index 100% rename from internal/provider/openai/think_test.go rename to internal/model/openai/think_test.go diff --git a/internal/provider/openai/tool_execution_wire_test.go b/internal/model/openai/tool_execution_wire_test.go similarity index 98% rename from internal/provider/openai/tool_execution_wire_test.go rename to internal/model/openai/tool_execution_wire_test.go index e63eda8f6f..e8ba3d3c0e 100644 --- a/internal/provider/openai/tool_execution_wire_test.go +++ b/internal/model/openai/tool_execution_wire_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestBuildRequestExcludesToolExecution(t *testing.T) { diff --git a/internal/providerbroker/broker_test.go b/internal/model/providerbroker/broker_test.go similarity index 99% rename from internal/providerbroker/broker_test.go rename to internal/model/providerbroker/broker_test.go index f2e504f72a..0f7f5e6417 100644 --- a/internal/providerbroker/broker_test.go +++ b/internal/model/providerbroker/broker_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) const testToken = "broker-token" diff --git a/internal/providerbroker/client.go b/internal/model/providerbroker/client.go similarity index 99% rename from internal/providerbroker/client.go rename to internal/model/providerbroker/client.go index ccb161da66..6e7a210087 100644 --- a/internal/providerbroker/client.go +++ b/internal/model/providerbroker/client.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // catalogTTL bounds how stale a remote session's model list may be. The list diff --git a/internal/providerbroker/doc.go b/internal/model/providerbroker/doc.go similarity index 100% rename from internal/providerbroker/doc.go rename to internal/model/providerbroker/doc.go diff --git a/internal/providerbroker/local.go b/internal/model/providerbroker/local.go similarity index 97% rename from internal/providerbroker/local.go rename to internal/model/providerbroker/local.go index 61102670d4..a88166dae3 100644 --- a/internal/providerbroker/local.go +++ b/internal/model/providerbroker/local.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // Local is this machine's broker: a Server on a loopback listener, plus the diff --git a/internal/providerbroker/server.go b/internal/model/providerbroker/server.go similarity index 99% rename from internal/providerbroker/server.go rename to internal/model/providerbroker/server.go index 4ee66f98da..aae2364b08 100644 --- a/internal/providerbroker/server.go +++ b/internal/model/providerbroker/server.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // ErrNoToken refuses a Server built without one. An unauthenticated broker on diff --git a/internal/providerbroker/tunnel_test.go b/internal/model/providerbroker/tunnel_test.go similarity index 97% rename from internal/providerbroker/tunnel_test.go rename to internal/model/providerbroker/tunnel_test.go index efd28011c6..9427ddb871 100644 --- a/internal/providerbroker/tunnel_test.go +++ b/internal/model/providerbroker/tunnel_test.go @@ -9,9 +9,9 @@ import ( "golang.org/x/crypto/ssh" - "reasonix/internal/provider" - "reasonix/internal/remote/forward" - "reasonix/internal/remote/sshtest" + "reasonix/internal/contract/provider" + "reasonix/internal/platform/remote/forward" + "reasonix/internal/platform/remote/sshtest" ) // tunnelTo publishes local on the test server's loopback the way an attach diff --git a/internal/providerbroker/wire.go b/internal/model/providerbroker/wire.go similarity index 99% rename from internal/providerbroker/wire.go rename to internal/model/providerbroker/wire.go index 0cf866a67b..69e4e8e4c5 100644 --- a/internal/providerbroker/wire.go +++ b/internal/model/providerbroker/wire.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // The wire surface, versioned as one: a Client and a Server that disagree diff --git a/internal/provider/responses/image_test.go b/internal/model/responses/image_test.go similarity index 98% rename from internal/provider/responses/image_test.go rename to internal/model/responses/image_test.go index 8749254770..bee0c0f94f 100644 --- a/internal/provider/responses/image_test.go +++ b/internal/model/responses/image_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestOfficialDeepSeekResponsesImageMetadataMatchesTextOnlyWireBytes(t *testing.T) { diff --git a/internal/provider/responses/keyresolver.go b/internal/model/responses/keyresolver.go similarity index 100% rename from internal/provider/responses/keyresolver.go rename to internal/model/responses/keyresolver.go diff --git a/internal/provider/responses/output_budget.go b/internal/model/responses/output_budget.go similarity index 93% rename from internal/provider/responses/output_budget.go rename to internal/model/responses/output_budget.go index 108bd9d02e..2eb62f6aed 100644 --- a/internal/provider/responses/output_budget.go +++ b/internal/model/responses/output_budget.go @@ -1,6 +1,6 @@ package responses -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // OutputBudget reports the default total output budget sent by this client. func (c *client) OutputBudget() int { return c.maxOutputTokens } diff --git a/internal/provider/responses/output_budget_test.go b/internal/model/responses/output_budget_test.go similarity index 100% rename from internal/provider/responses/output_budget_test.go rename to internal/model/responses/output_budget_test.go diff --git a/internal/provider/responses/realdeepseek_test.go b/internal/model/responses/realdeepseek_test.go similarity index 99% rename from internal/provider/responses/realdeepseek_test.go rename to internal/model/responses/realdeepseek_test.go index 669bf6cfc4..f2eb53d209 100644 --- a/internal/provider/responses/realdeepseek_test.go +++ b/internal/model/responses/realdeepseek_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestRealOpenCodeGoDeepSeekResponsesWebSearch exercises Reasonix's stateless diff --git a/internal/provider/responses/request_url_test.go b/internal/model/responses/request_url_test.go similarity index 97% rename from internal/provider/responses/request_url_test.go rename to internal/model/responses/request_url_test.go index cc0389d574..d5d85cf2b5 100644 --- a/internal/provider/responses/request_url_test.go +++ b/internal/model/responses/request_url_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestStreamUsesConfiguredRequestURLExactly(t *testing.T) { diff --git a/internal/provider/responses/responses.go b/internal/model/responses/responses.go similarity index 99% rename from internal/provider/responses/responses.go rename to internal/model/responses/responses.go index 791032982f..8ca837dbf6 100644 --- a/internal/provider/responses/responses.go +++ b/internal/model/responses/responses.go @@ -17,9 +17,9 @@ import ( "sync/atomic" "time" - "reasonix/internal/netclient" - "reasonix/internal/provider" - provideropenai "reasonix/internal/provider/openai" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/provider" + provideropenai "reasonix/internal/model/openai" ) const ( diff --git a/internal/provider/responses/responses_test.go b/internal/model/responses/responses_test.go similarity index 99% rename from internal/provider/responses/responses_test.go rename to internal/model/responses/responses_test.go index e49e8f6c45..7923cdd162 100644 --- a/internal/provider/responses/responses_test.go +++ b/internal/model/responses/responses_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func collect(t *testing.T, p provider.Provider, req provider.Request) []provider.Chunk { diff --git a/internal/provider/responses/stall_test.go b/internal/model/responses/stall_test.go similarity index 99% rename from internal/provider/responses/stall_test.go rename to internal/model/responses/stall_test.go index 442b1b05d4..49049e239a 100644 --- a/internal/provider/responses/stall_test.go +++ b/internal/model/responses/stall_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func flush(w http.ResponseWriter) { diff --git a/internal/provider/responses/stream.go b/internal/model/responses/stream.go similarity index 99% rename from internal/provider/responses/stream.go rename to internal/model/responses/stream.go index b3313ee329..f339f20c2f 100644 --- a/internal/provider/responses/stream.go +++ b/internal/model/responses/stream.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // streamedCall accumulates one function call across its argument deltas. diff --git a/internal/provider/responses/test_hooks.go b/internal/model/responses/test_hooks.go similarity index 100% rename from internal/provider/responses/test_hooks.go rename to internal/model/responses/test_hooks.go diff --git a/internal/provider/responses/tool_execution_wire_test.go b/internal/model/responses/tool_execution_wire_test.go similarity index 98% rename from internal/provider/responses/tool_execution_wire_test.go rename to internal/model/responses/tool_execution_wire_test.go index d588bb9846..01de5efd22 100644 --- a/internal/provider/responses/tool_execution_wire_test.go +++ b/internal/model/responses/tool_execution_wire_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestBuildRequestBodyExcludesToolExecution(t *testing.T) { diff --git a/internal/provider/responses/vendor.go b/internal/model/responses/vendor.go similarity index 99% rename from internal/provider/responses/vendor.go rename to internal/model/responses/vendor.go index 0935d2564e..31dd990983 100644 --- a/internal/provider/responses/vendor.go +++ b/internal/model/responses/vendor.go @@ -4,7 +4,7 @@ import ( "net/url" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // vendorCapabilities describes how a Responses-compatible endpoint deviates diff --git a/internal/provider/responses/web_search.go b/internal/model/responses/web_search.go similarity index 97% rename from internal/provider/responses/web_search.go rename to internal/model/responses/web_search.go index 107703f354..517612a00c 100644 --- a/internal/provider/responses/web_search.go +++ b/internal/model/responses/web_search.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // The Responses wire runs web_search server-side and keeps the result text diff --git a/internal/provider/responses/web_search_replay_test.go b/internal/model/responses/web_search_replay_test.go similarity index 95% rename from internal/provider/responses/web_search_replay_test.go rename to internal/model/responses/web_search_replay_test.go index e185babe51..5316c0c3cc 100644 --- a/internal/provider/responses/web_search_replay_test.go +++ b/internal/model/responses/web_search_replay_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestConversationDigestIncludesEnabledWebSearchReplayItems(t *testing.T) { diff --git a/internal/provider/responses/wire_gap_test.go b/internal/model/responses/wire_gap_test.go similarity index 99% rename from internal/provider/responses/wire_gap_test.go rename to internal/model/responses/wire_gap_test.go index c8b5599ce9..1818334ddd 100644 --- a/internal/provider/responses/wire_gap_test.go +++ b/internal/model/responses/wire_gap_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestCompletedWebSearchCallSurfacesAsAFinishedServerTool(t *testing.T) { diff --git a/internal/visionimage/visionimage.go b/internal/model/visionimage/visionimage.go similarity index 100% rename from internal/visionimage/visionimage.go rename to internal/model/visionimage/visionimage.go diff --git a/internal/visionimage/visionimage_test.go b/internal/model/visionimage/visionimage_test.go similarity index 100% rename from internal/visionimage/visionimage_test.go rename to internal/model/visionimage/visionimage_test.go diff --git a/internal/account/account.go b/internal/platform/account/account.go similarity index 100% rename from internal/account/account.go rename to internal/platform/account/account.go diff --git a/internal/account/account_test.go b/internal/platform/account/account_test.go similarity index 100% rename from internal/account/account_test.go rename to internal/platform/account/account_test.go diff --git a/internal/account/token.go b/internal/platform/account/token.go similarity index 96% rename from internal/account/token.go rename to internal/platform/account/token.go index 00a0daba5c..9acd017f51 100644 --- a/internal/account/token.go +++ b/internal/platform/account/token.go @@ -3,7 +3,7 @@ package account import ( "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // TokenKey is where the session token lives in the credential store, so it diff --git a/internal/appidentity/identity.go b/internal/platform/appidentity/identity.go similarity index 100% rename from internal/appidentity/identity.go rename to internal/platform/appidentity/identity.go diff --git a/internal/appidentity/identity_test.go b/internal/platform/appidentity/identity_test.go similarity index 100% rename from internal/appidentity/identity_test.go rename to internal/platform/appidentity/identity_test.go diff --git a/internal/appupdate/apply_other.go b/internal/platform/appupdate/apply_other.go similarity index 94% rename from internal/appupdate/apply_other.go rename to internal/platform/appupdate/apply_other.go index 5d332c4ffb..c297241fee 100644 --- a/internal/appupdate/apply_other.go +++ b/internal/platform/appupdate/apply_other.go @@ -5,7 +5,7 @@ package appupdate import ( "context" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) // applyDownloaded stages the release into the versioned layout and swaps. The diff --git a/internal/appupdate/apply_windows.go b/internal/platform/appupdate/apply_windows.go similarity index 93% rename from internal/appupdate/apply_windows.go rename to internal/platform/appupdate/apply_windows.go index 669dfe50ff..7fdcc12e7c 100644 --- a/internal/appupdate/apply_windows.go +++ b/internal/platform/appupdate/apply_windows.go @@ -5,7 +5,7 @@ package appupdate import ( "context" - "reasonix/internal/update" + "reasonix/internal/platform/update" ) // applyDownloaded runs the next installer. Windows cannot replace a running diff --git a/internal/appupdate/appupdate.go b/internal/platform/appupdate/appupdate.go similarity index 97% rename from internal/appupdate/appupdate.go rename to internal/platform/appupdate/appupdate.go index 2232e55e21..8d07792d51 100644 --- a/internal/appupdate/appupdate.go +++ b/internal/platform/appupdate/appupdate.go @@ -4,8 +4,8 @@ package appupdate import ( "context" - "reasonix/internal/repair" - "reasonix/internal/update" + "reasonix/internal/platform/repair" + "reasonix/internal/platform/update" ) // ApplicationOwner owns the running desktop application: it can bring it to a diff --git a/internal/appupdate/appupdate_test.go b/internal/platform/appupdate/appupdate_test.go similarity index 97% rename from internal/appupdate/appupdate_test.go rename to internal/platform/appupdate/appupdate_test.go index 5345951d17..e16ef17e6e 100644 --- a/internal/appupdate/appupdate_test.go +++ b/internal/platform/appupdate/appupdate_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) type stubOwner struct{} diff --git a/internal/appupdate/catalog_test.go b/internal/platform/appupdate/catalog_test.go similarity index 100% rename from internal/appupdate/catalog_test.go rename to internal/platform/appupdate/catalog_test.go diff --git a/internal/appupdate/install.go b/internal/platform/appupdate/install.go similarity index 99% rename from internal/appupdate/install.go rename to internal/platform/appupdate/install.go index d40a4baf8b..9ef77c48d1 100644 --- a/internal/appupdate/install.go +++ b/internal/platform/appupdate/install.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "reasonix/internal/netclient" - "reasonix/internal/update" + "reasonix/internal/base/netclient" + "reasonix/internal/platform/update" ) // installTimeout bounds the whole move. It is generous because the artifact is diff --git a/internal/browser/act.go b/internal/platform/browser/act.go similarity index 100% rename from internal/browser/act.go rename to internal/platform/browser/act.go diff --git a/internal/browser/browser_test.go b/internal/platform/browser/browser_test.go similarity index 99% rename from internal/browser/browser_test.go rename to internal/platform/browser/browser_test.go index 98d7331b54..f83853a49d 100644 --- a/internal/browser/browser_test.go +++ b/internal/platform/browser/browser_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // slashPath is p as a URL path: C:\x is /C:/x, the form a browser reports. diff --git a/internal/browser/capture.go b/internal/platform/browser/capture.go similarity index 98% rename from internal/browser/capture.go rename to internal/platform/browser/capture.go index 337442292a..d4fe46dea6 100644 --- a/internal/browser/capture.go +++ b/internal/platform/browser/capture.go @@ -10,7 +10,7 @@ import ( "image/jpeg" "strings" - "reasonix/internal/visionimage" + "reasonix/internal/model/visionimage" ) // Screenshot captures what a tab's viewport shows, sized for a vision model. diff --git a/internal/browser/cdp.go b/internal/platform/browser/cdp.go similarity index 100% rename from internal/browser/cdp.go rename to internal/platform/browser/cdp.go diff --git a/internal/browser/credential.go b/internal/platform/browser/credential.go similarity index 100% rename from internal/browser/credential.go rename to internal/platform/browser/credential.go diff --git a/internal/browser/discover.go b/internal/platform/browser/discover.go similarity index 100% rename from internal/browser/discover.go rename to internal/platform/browser/discover.go diff --git a/internal/browser/doc.go b/internal/platform/browser/doc.go similarity index 100% rename from internal/browser/doc.go rename to internal/platform/browser/doc.go diff --git a/internal/browser/endpoint.go b/internal/platform/browser/endpoint.go similarity index 100% rename from internal/browser/endpoint.go rename to internal/platform/browser/endpoint.go diff --git a/internal/browser/endpoint_test.go b/internal/platform/browser/endpoint_test.go similarity index 100% rename from internal/browser/endpoint_test.go rename to internal/platform/browser/endpoint_test.go diff --git a/internal/browser/engine.go b/internal/platform/browser/engine.go similarity index 99% rename from internal/browser/engine.go rename to internal/platform/browser/engine.go index 2b022f8837..0cfb55d085 100644 --- a/internal/browser/engine.go +++ b/internal/platform/browser/engine.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "reasonix/internal/proc" + "reasonix/internal/base/proc" ) const ( diff --git a/internal/browser/eval.go b/internal/platform/browser/eval.go similarity index 100% rename from internal/browser/eval.go rename to internal/platform/browser/eval.go diff --git a/internal/browser/eval_test.go b/internal/platform/browser/eval_test.go similarity index 100% rename from internal/browser/eval_test.go rename to internal/platform/browser/eval_test.go diff --git a/internal/browser/failure.go b/internal/platform/browser/failure.go similarity index 100% rename from internal/browser/failure.go rename to internal/platform/browser/failure.go diff --git a/internal/browser/fake_cdp_test.go b/internal/platform/browser/fake_cdp_test.go similarity index 100% rename from internal/browser/fake_cdp_test.go rename to internal/platform/browser/fake_cdp_test.go diff --git a/internal/browser/keys.go b/internal/platform/browser/keys.go similarity index 100% rename from internal/browser/keys.go rename to internal/platform/browser/keys.go diff --git a/internal/browser/live_test.go b/internal/platform/browser/live_test.go similarity index 99% rename from internal/browser/live_test.go rename to internal/platform/browser/live_test.go index ea56f10c8b..0bfbdabfda 100644 --- a/internal/browser/live_test.go +++ b/internal/platform/browser/live_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // liveSession starts a real browser when REASONIX_LIVE_BROWSER names one (or diff --git a/internal/browser/network.go b/internal/platform/browser/network.go similarity index 100% rename from internal/browser/network.go rename to internal/platform/browser/network.go diff --git a/internal/browser/policy.go b/internal/platform/browser/policy.go similarity index 99% rename from internal/browser/policy.go rename to internal/platform/browser/policy.go index f64f751b91..d1011e89f5 100644 --- a/internal/browser/policy.go +++ b/internal/platform/browser/policy.go @@ -6,7 +6,7 @@ import ( "runtime" "strings" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // checkURL decides whether a page may be loaded. http and https go anywhere diff --git a/internal/browser/refs.go b/internal/platform/browser/refs.go similarity index 100% rename from internal/browser/refs.go rename to internal/platform/browser/refs.go diff --git a/internal/browser/session.go b/internal/platform/browser/session.go similarity index 100% rename from internal/browser/session.go rename to internal/platform/browser/session.go diff --git a/internal/browser/snapshot.go b/internal/platform/browser/snapshot.go similarity index 100% rename from internal/browser/snapshot.go rename to internal/platform/browser/snapshot.go diff --git a/internal/browser/tab.go b/internal/platform/browser/tab.go similarity index 100% rename from internal/browser/tab.go rename to internal/platform/browser/tab.go diff --git a/internal/browser/transport.go b/internal/platform/browser/transport.go similarity index 100% rename from internal/browser/transport.go rename to internal/platform/browser/transport.go diff --git a/internal/computer/doc.go b/internal/platform/computer/doc.go similarity index 100% rename from internal/computer/doc.go rename to internal/platform/computer/doc.go diff --git a/internal/computer/failure.go b/internal/platform/computer/failure.go similarity index 100% rename from internal/computer/failure.go rename to internal/platform/computer/failure.go diff --git a/internal/computer/helper.go b/internal/platform/computer/helper.go similarity index 99% rename from internal/computer/helper.go rename to internal/platform/computer/helper.go index 03d1424b7b..66f6911297 100644 --- a/internal/computer/helper.go +++ b/internal/platform/computer/helper.go @@ -9,7 +9,7 @@ import ( "os/exec" "sync" - "reasonix/internal/proc" + "reasonix/internal/base/proc" ) // Helper is the native process that carries operations out. It starts on first diff --git a/internal/computer/live_darwin_test.go b/internal/platform/computer/live_darwin_test.go similarity index 99% rename from internal/computer/live_darwin_test.go rename to internal/platform/computer/live_darwin_test.go index 7a3dabfca3..885e32298b 100644 --- a/internal/computer/live_darwin_test.go +++ b/internal/platform/computer/live_darwin_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) const targetBundle = "io.reasonix.test.computer-target" diff --git a/internal/computer/live_test.go b/internal/platform/computer/live_test.go similarity index 100% rename from internal/computer/live_test.go rename to internal/platform/computer/live_test.go diff --git a/internal/computer/live_windows_test.go b/internal/platform/computer/live_windows_test.go similarity index 99% rename from internal/computer/live_windows_test.go rename to internal/platform/computer/live_windows_test.go index ef005ebb94..da77cec7bd 100644 --- a/internal/computer/live_windows_test.go +++ b/internal/platform/computer/live_windows_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) const windowsTarget = "computer-target.exe" diff --git a/internal/computer/session.go b/internal/platform/computer/session.go similarity index 99% rename from internal/computer/session.go rename to internal/platform/computer/session.go index 6a91f62717..cbebcda8db 100644 --- a/internal/computer/session.go +++ b/internal/platform/computer/session.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "reasonix/internal/visionimage" + "reasonix/internal/model/visionimage" ) // maxWait bounds a wait step: a pause longer than this is a task that should diff --git a/internal/computer/session_test.go b/internal/platform/computer/session_test.go similarity index 99% rename from internal/computer/session_test.go rename to internal/platform/computer/session_test.go index 6340d88d98..465eb9b0c2 100644 --- a/internal/computer/session_test.go +++ b/internal/platform/computer/session_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "reasonix/internal/visionimage" + "reasonix/internal/model/visionimage" ) // fakeHelperEnv makes the test binary answer as the native helper, so the diff --git a/internal/computer/testdata/target.swift b/internal/platform/computer/testdata/target.swift similarity index 100% rename from internal/computer/testdata/target.swift rename to internal/platform/computer/testdata/target.swift diff --git a/internal/computer/testdata/wintarget/main.go b/internal/platform/computer/testdata/wintarget/main.go similarity index 100% rename from internal/computer/testdata/wintarget/main.go rename to internal/platform/computer/testdata/wintarget/main.go diff --git a/internal/crashreport/cli.go b/internal/platform/crashreport/cli.go similarity index 99% rename from internal/crashreport/cli.go rename to internal/platform/crashreport/cli.go index 6811f0a060..37b6ff7372 100644 --- a/internal/crashreport/cli.go +++ b/internal/platform/crashreport/cli.go @@ -25,8 +25,8 @@ import ( "time" "unicode/utf8" - "reasonix/internal/fileutil" - "reasonix/internal/netclient" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/netclient" ) const ( diff --git a/internal/crashreport/cli_test.go b/internal/platform/crashreport/cli_test.go similarity index 93% rename from internal/crashreport/cli_test.go rename to internal/platform/crashreport/cli_test.go index 682f441396..c55545a700 100644 --- a/internal/crashreport/cli_test.go +++ b/internal/platform/crashreport/cli_test.go @@ -14,7 +14,7 @@ import ( "testing" "unicode/utf8" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) type roundTripFunc func(*http.Request) (*http.Response, error) @@ -26,8 +26,8 @@ func TestCapturePanicWritesBoundedSanitizedReport(t *testing.T) { secret := "private prompt contents" apiKey := "sk-proj-abcdefghijklmnopqrstuvwxyz1234567890" stack := "goroutine 7 [running]:\n" + - "reasonix/internal/agent.run(" + secret + ")\n" + - "\t/Users/alice/private-project/internal/agent/run.go:42 +0x123\n" + + "reasonix/internal/runtime/agent.run(" + secret + ")\n" + + "\t/Users/alice/private-project/internal/runtime/agent/run.go:42 +0x123\n" + "Authorization: Bearer abcdefghijklmnopqrstuvwxyz1234567890\n" + "api_key=" + apiKey @@ -42,10 +42,10 @@ func TestCapturePanicWritesBoundedSanitizedReport(t *testing.T) { if report.Kind != "crash" || report.Source != "cli.go" || report.Label != "panic" || report.SchemaVersion != 2 { t.Fatalf("report metadata = %+v", report) } - if !strings.Contains(report.Stack, "reasonix/internal/agent.run(...)") || !strings.Contains(report.Stack, "/run.go:42") { + if !strings.Contains(report.Stack, "reasonix/internal/runtime/agent.run(...)") || !strings.Contains(report.Stack, "/run.go:42") { t.Fatalf("sanitized stack = %q", report.Stack) } - if report.TopFrame != "reasonix/internal/agent.run /run.go:42" { + if report.TopFrame != "reasonix/internal/runtime/agent.run /run.go:42" { t.Fatalf("top frame = %q", report.TopFrame) } preview, err := Preview(report) diff --git a/internal/editor/editor.go b/internal/platform/editor/editor.go similarity index 100% rename from internal/editor/editor.go rename to internal/platform/editor/editor.go diff --git a/internal/editor/editor_test.go b/internal/platform/editor/editor_test.go similarity index 100% rename from internal/editor/editor_test.go rename to internal/platform/editor/editor_test.go diff --git a/internal/environment/probe.go b/internal/platform/environment/probe.go similarity index 99% rename from internal/environment/probe.go rename to internal/platform/environment/probe.go index 8cdf540398..3352a77af7 100644 --- a/internal/environment/probe.go +++ b/internal/platform/environment/probe.go @@ -16,10 +16,10 @@ import ( "sync" "time" - "reasonix/internal/fileutil" - "reasonix/internal/proc" - "reasonix/internal/secrets" - "reasonix/internal/shellparse" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" + "reasonix/internal/base/shellparse" ) const ProbeTimeout = 2 * time.Second diff --git a/internal/environment/probe_share_test.go b/internal/platform/environment/probe_share_test.go similarity index 99% rename from internal/environment/probe_share_test.go rename to internal/platform/environment/probe_share_test.go index f21bde6788..3f9d4c326e 100644 --- a/internal/environment/probe_share_test.go +++ b/internal/platform/environment/probe_share_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // The section this feeds is the same for every project on one machine, which is diff --git a/internal/environment/probe_test.go b/internal/platform/environment/probe_test.go similarity index 99% rename from internal/environment/probe_test.go rename to internal/platform/environment/probe_test.go index f18c13dc6f..c981b5c301 100644 --- a/internal/environment/probe_test.go +++ b/internal/platform/environment/probe_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "reasonix/internal/secrets" - "reasonix/internal/testenv" + "reasonix/internal/base/secrets" + "reasonix/internal/base/testenv" ) func runProbesWithOverrides(ctx context.Context, commands []string, overrides map[string]string) []ProbeResult { diff --git a/internal/environment/probe_windows_test.go b/internal/platform/environment/probe_windows_test.go similarity index 100% rename from internal/environment/probe_windows_test.go rename to internal/platform/environment/probe_windows_test.go diff --git a/internal/environment/snapshot.go b/internal/platform/environment/snapshot.go similarity index 98% rename from internal/environment/snapshot.go rename to internal/platform/environment/snapshot.go index ca1dd268e4..c3221390d2 100644 --- a/internal/environment/snapshot.go +++ b/internal/platform/environment/snapshot.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // Probe snapshots persist across process restarts so the environment section — diff --git a/internal/environment/snapshot_test.go b/internal/platform/environment/snapshot_test.go similarity index 99% rename from internal/environment/snapshot_test.go rename to internal/platform/environment/snapshot_test.go index e704348f98..8131201501 100644 --- a/internal/environment/snapshot_test.go +++ b/internal/platform/environment/snapshot_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestProbeSnapshotServesAcrossRestartsWithoutReprobing(t *testing.T) { diff --git a/internal/environment/workspace_vcs.go b/internal/platform/environment/workspace_vcs.go similarity index 96% rename from internal/environment/workspace_vcs.go rename to internal/platform/environment/workspace_vcs.go index 8117a0ff88..919b395fae 100644 --- a/internal/environment/workspace_vcs.go +++ b/internal/platform/environment/workspace_vcs.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // WorkspaceVCS names the version control the workspace is under, or "" for diff --git a/internal/environment/workspace_vcs_test.go b/internal/platform/environment/workspace_vcs_test.go similarity index 97% rename from internal/environment/workspace_vcs_test.go rename to internal/platform/environment/workspace_vcs_test.go index 13fd29b085..2c0f35bd83 100644 --- a/internal/environment/workspace_vcs_test.go +++ b/internal/platform/environment/workspace_vcs_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/fileutil" - "reasonix/internal/testenv" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/testenv" ) func TestWorkspaceVCSFindsRepositoryFromSubdirectory(t *testing.T) { diff --git a/internal/gitcmd/gitcmd.go b/internal/platform/gitcmd/gitcmd.go similarity index 98% rename from internal/gitcmd/gitcmd.go rename to internal/platform/gitcmd/gitcmd.go index 729e900e90..6fe61a347e 100644 --- a/internal/gitcmd/gitcmd.go +++ b/internal/platform/gitcmd/gitcmd.go @@ -29,8 +29,8 @@ import ( "slices" "time" - "reasonix/internal/proc" - "reasonix/internal/secrets" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" ) // baseConfig is the -c override set every invocation carries. diff --git a/internal/gitcmd/gitcmd_test.go b/internal/platform/gitcmd/gitcmd_test.go similarity index 99% rename from internal/gitcmd/gitcmd_test.go rename to internal/platform/gitcmd/gitcmd_test.go index 435ad05dd9..9811fbce57 100644 --- a/internal/gitcmd/gitcmd_test.go +++ b/internal/platform/gitcmd/gitcmd_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func hasConfig(args []string, want string) bool { diff --git a/internal/gitstatus/gitstatus.go b/internal/platform/gitstatus/gitstatus.go similarity index 99% rename from internal/gitstatus/gitstatus.go rename to internal/platform/gitstatus/gitstatus.go index 95d0dd0c01..83b0fb4b85 100644 --- a/internal/gitstatus/gitstatus.go +++ b/internal/platform/gitstatus/gitstatus.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "reasonix/internal/gitcmd" + "reasonix/internal/platform/gitcmd" ) // Change is one path git reports as differing from HEAD. Status is the diff --git a/internal/gitstatus/gitstatus_test.go b/internal/platform/gitstatus/gitstatus_test.go similarity index 99% rename from internal/gitstatus/gitstatus_test.go rename to internal/platform/gitstatus/gitstatus_test.go index 4d357fc9a5..2bcf794f0b 100644 --- a/internal/gitstatus/gitstatus_test.go +++ b/internal/platform/gitstatus/gitstatus_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func git(t *testing.T, dir string, args ...string) { diff --git a/internal/gitstatus/numstat_test.go b/internal/platform/gitstatus/numstat_test.go similarity index 100% rename from internal/gitstatus/numstat_test.go rename to internal/platform/gitstatus/numstat_test.go diff --git a/internal/installlayout/activate.go b/internal/platform/installlayout/activate.go similarity index 99% rename from internal/installlayout/activate.go rename to internal/platform/installlayout/activate.go index 0380ed6673..22c6cd3a67 100644 --- a/internal/installlayout/activate.go +++ b/internal/platform/installlayout/activate.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "reasonix/internal/filelock" + "reasonix/internal/base/filelock" ) const activationLockName = ".reasonix-activate.lock" diff --git a/internal/installlayout/activate_test.go b/internal/platform/installlayout/activate_test.go similarity index 99% rename from internal/installlayout/activate_test.go rename to internal/platform/installlayout/activate_test.go index 9e54d35dd7..67194efc4a 100644 --- a/internal/installlayout/activate_test.go +++ b/internal/platform/installlayout/activate_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeTempMember(t *testing.T, dir, name, body string) string { diff --git a/internal/installlayout/current.go b/internal/platform/installlayout/current.go similarity index 99% rename from internal/installlayout/current.go rename to internal/platform/installlayout/current.go index fa61d5943f..db4f3f227b 100644 --- a/internal/installlayout/current.go +++ b/internal/platform/installlayout/current.go @@ -19,7 +19,7 @@ import ( "strings" "unicode" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) const ( diff --git a/internal/installlayout/current_test.go b/internal/platform/installlayout/current_test.go similarity index 99% rename from internal/installlayout/current_test.go rename to internal/platform/installlayout/current_test.go index c26ab97355..7003172bc9 100644 --- a/internal/installlayout/current_test.go +++ b/internal/platform/installlayout/current_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestDecodeCurrentAcceptsSchema1(t *testing.T) { diff --git a/internal/installlayout/fault_inject_test.go b/internal/platform/installlayout/fault_inject_test.go similarity index 99% rename from internal/installlayout/fault_inject_test.go rename to internal/platform/installlayout/fault_inject_test.go index d7f4b140d1..5bfae1f5de 100644 --- a/internal/installlayout/fault_inject_test.go +++ b/internal/platform/installlayout/fault_inject_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeMembers(t *testing.T, dir string, body string) []Member { diff --git a/internal/instanceid/instanceid.go b/internal/platform/instanceid/instanceid.go similarity index 95% rename from internal/instanceid/instanceid.go rename to internal/platform/instanceid/instanceid.go index e4ff0797b5..a0030c7e3e 100644 --- a/internal/instanceid/instanceid.go +++ b/internal/platform/instanceid/instanceid.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/config" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" ) // Prefix is the bundle's own identifier, so a Studio launch never answers the diff --git a/internal/instanceid/instanceid_test.go b/internal/platform/instanceid/instanceid_test.go similarity index 100% rename from internal/instanceid/instanceid_test.go rename to internal/platform/instanceid/instanceid_test.go diff --git a/internal/lsp/client.go b/internal/platform/lsp/client.go similarity index 99% rename from internal/lsp/client.go rename to internal/platform/lsp/client.go index adf82f7115..b9e221ed7d 100644 --- a/internal/lsp/client.go +++ b/internal/platform/lsp/client.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "reasonix/internal/proc" - "reasonix/internal/secrets" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" ) // docState tracks what we last sent the server for a document, so ensureSynced diff --git a/internal/lsp/jsonrpc.go b/internal/platform/lsp/jsonrpc.go similarity index 100% rename from internal/lsp/jsonrpc.go rename to internal/platform/lsp/jsonrpc.go diff --git a/internal/lsp/jsonrpc_framecap_test.go b/internal/platform/lsp/jsonrpc_framecap_test.go similarity index 100% rename from internal/lsp/jsonrpc_framecap_test.go rename to internal/platform/lsp/jsonrpc_framecap_test.go diff --git a/internal/lsp/lsp_test.go b/internal/platform/lsp/lsp_test.go similarity index 99% rename from internal/lsp/lsp_test.go rename to internal/platform/lsp/lsp_test.go index 9a28530b9d..aa05f0a16b 100644 --- a/internal/lsp/lsp_test.go +++ b/internal/platform/lsp/lsp_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestDefaultSpecsInvariants(t *testing.T) { diff --git a/internal/lsp/main_test.go b/internal/platform/lsp/main_test.go similarity index 100% rename from internal/lsp/main_test.go rename to internal/platform/lsp/main_test.go diff --git a/internal/lsp/manager.go b/internal/platform/lsp/manager.go similarity index 100% rename from internal/lsp/manager.go rename to internal/platform/lsp/manager.go diff --git a/internal/lsp/manual_test.go b/internal/platform/lsp/manual_test.go similarity index 96% rename from internal/lsp/manual_test.go rename to internal/platform/lsp/manual_test.go index 4e5461b99c..16af765ee4 100644 --- a/internal/lsp/manual_test.go +++ b/internal/platform/lsp/manual_test.go @@ -15,7 +15,7 @@ import ( // TestLanguageServers drives each installed mainstream server against a per- // language fixture under testdata/lsp. Servers not on PATH are skipped. Run with: // -// go test -tags manual -run TestLanguageServers -v ./internal/lsp/ +// go test -tags manual -run TestLanguageServers -v ./internal/platform/lsp/ func TestLanguageServers(t *testing.T) { specs := DefaultSpecs() cases := []struct { @@ -96,7 +96,7 @@ func oneLine(s string) string { // TestGoplsSmoke drives a real gopls against this module's own source. Run with: // -// go test -tags manual -run TestGoplsSmoke -v ./internal/lsp/ +// go test -tags manual -run TestGoplsSmoke -v ./internal/platform/lsp/ func TestGoplsSmoke(t *testing.T) { root := moduleRoot(t) m := NewManager(root, DefaultSpecs()) diff --git a/internal/lsp/position.go b/internal/platform/lsp/position.go similarity index 100% rename from internal/lsp/position.go rename to internal/platform/lsp/position.go diff --git a/internal/lsp/results.go b/internal/platform/lsp/results.go similarity index 100% rename from internal/lsp/results.go rename to internal/platform/lsp/results.go diff --git a/internal/lsp/testdata/lsp/bash/script.sh b/internal/platform/lsp/testdata/lsp/bash/script.sh similarity index 100% rename from internal/lsp/testdata/lsp/bash/script.sh rename to internal/platform/lsp/testdata/lsp/bash/script.sh diff --git a/internal/lsp/testdata/lsp/golang/go.mod b/internal/platform/lsp/testdata/lsp/golang/go.mod similarity index 100% rename from internal/lsp/testdata/lsp/golang/go.mod rename to internal/platform/lsp/testdata/lsp/golang/go.mod diff --git a/internal/lsp/testdata/lsp/golang/main.go b/internal/platform/lsp/testdata/lsp/golang/main.go similarity index 100% rename from internal/lsp/testdata/lsp/golang/main.go rename to internal/platform/lsp/testdata/lsp/golang/main.go diff --git a/internal/lsp/testdata/lsp/python/main.py b/internal/platform/lsp/testdata/lsp/python/main.py similarity index 100% rename from internal/lsp/testdata/lsp/python/main.py rename to internal/platform/lsp/testdata/lsp/python/main.py diff --git a/internal/lsp/testdata/lsp/rust/.gitignore b/internal/platform/lsp/testdata/lsp/rust/.gitignore similarity index 100% rename from internal/lsp/testdata/lsp/rust/.gitignore rename to internal/platform/lsp/testdata/lsp/rust/.gitignore diff --git a/internal/lsp/testdata/lsp/rust/Cargo.lock b/internal/platform/lsp/testdata/lsp/rust/Cargo.lock similarity index 100% rename from internal/lsp/testdata/lsp/rust/Cargo.lock rename to internal/platform/lsp/testdata/lsp/rust/Cargo.lock diff --git a/internal/lsp/testdata/lsp/rust/Cargo.toml b/internal/platform/lsp/testdata/lsp/rust/Cargo.toml similarity index 100% rename from internal/lsp/testdata/lsp/rust/Cargo.toml rename to internal/platform/lsp/testdata/lsp/rust/Cargo.toml diff --git a/internal/lsp/testdata/lsp/rust/src/main.rs b/internal/platform/lsp/testdata/lsp/rust/src/main.rs similarity index 100% rename from internal/lsp/testdata/lsp/rust/src/main.rs rename to internal/platform/lsp/testdata/lsp/rust/src/main.rs diff --git a/internal/lsp/testdata/lsp/typescript/index.ts b/internal/platform/lsp/testdata/lsp/typescript/index.ts similarity index 100% rename from internal/lsp/testdata/lsp/typescript/index.ts rename to internal/platform/lsp/testdata/lsp/typescript/index.ts diff --git a/internal/lsp/testdata/lsp/typescript/tsconfig.json b/internal/platform/lsp/testdata/lsp/typescript/tsconfig.json similarity index 100% rename from internal/lsp/testdata/lsp/typescript/tsconfig.json rename to internal/platform/lsp/testdata/lsp/typescript/tsconfig.json diff --git a/internal/lsp/tool.go b/internal/platform/lsp/tool.go similarity index 98% rename from internal/lsp/tool.go rename to internal/platform/lsp/tool.go index dd6bc5e982..b61deff04c 100644 --- a/internal/lsp/tool.go +++ b/internal/platform/lsp/tool.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // Tools adapts the manager's read-only queries to the tool.Tool interface. They diff --git a/internal/notify/sender_darwin.go b/internal/platform/notify/sender_darwin.go similarity index 95% rename from internal/notify/sender_darwin.go rename to internal/platform/notify/sender_darwin.go index fd0f459519..90b34c04d5 100644 --- a/internal/notify/sender_darwin.go +++ b/internal/platform/notify/sender_darwin.go @@ -4,7 +4,7 @@ package notify import ( "os/exec" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" "strings" ) diff --git a/internal/notify/sender_linux.go b/internal/platform/notify/sender_linux.go similarity index 93% rename from internal/notify/sender_linux.go rename to internal/platform/notify/sender_linux.go index bdbe695820..bba0ade9c8 100644 --- a/internal/notify/sender_linux.go +++ b/internal/platform/notify/sender_linux.go @@ -5,7 +5,7 @@ package notify import ( "os/exec" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" ) // PlatformSender delivers notifications through the host OS. diff --git a/internal/notify/sender_other.go b/internal/platform/notify/sender_other.go similarity index 100% rename from internal/notify/sender_other.go rename to internal/platform/notify/sender_other.go diff --git a/internal/notify/sender_windows.go b/internal/platform/notify/sender_windows.go similarity index 93% rename from internal/notify/sender_windows.go rename to internal/platform/notify/sender_windows.go index 7091293e57..f14d4a911b 100644 --- a/internal/notify/sender_windows.go +++ b/internal/platform/notify/sender_windows.go @@ -5,7 +5,7 @@ package notify import ( "git.sr.ht/~jackmordaunt/go-toast/v2" - "reasonix/internal/appidentity" + "reasonix/internal/platform/appidentity" ) // PlatformSender delivers notifications through the Windows Toast API. diff --git a/internal/notify/settings.go b/internal/platform/notify/settings.go similarity index 96% rename from internal/notify/settings.go rename to internal/platform/notify/settings.go index b0da789eb3..a66fd1c70c 100644 --- a/internal/notify/settings.go +++ b/internal/platform/notify/settings.go @@ -3,7 +3,7 @@ package notify import ( "sync/atomic" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // Settings is what a sink reads on every event, so a window flipping the switch diff --git a/internal/notify/sink.go b/internal/platform/notify/sink.go similarity index 95% rename from internal/notify/sink.go rename to internal/platform/notify/sink.go index af2e6a0cf8..2d726ec5ac 100644 --- a/internal/notify/sink.go +++ b/internal/platform/notify/sink.go @@ -1,9 +1,9 @@ package notify import ( - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" ) // Message is the user-visible payload sent to the platform notifier. diff --git a/internal/notify/sink_test.go b/internal/platform/notify/sink_test.go similarity index 98% rename from internal/notify/sink_test.go rename to internal/platform/notify/sink_test.go index 5c156675a9..dc89134856 100644 --- a/internal/notify/sink_test.go +++ b/internal/platform/notify/sink_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" ) var errTestFailure = errors.New("failed") diff --git a/internal/packagegrant/acl.go b/internal/platform/packagegrant/acl.go similarity index 100% rename from internal/packagegrant/acl.go rename to internal/platform/packagegrant/acl.go diff --git a/internal/packagegrant/acl_test.go b/internal/platform/packagegrant/acl_test.go similarity index 100% rename from internal/packagegrant/acl_test.go rename to internal/platform/packagegrant/acl_test.go diff --git a/internal/packagegrant/doc.go b/internal/platform/packagegrant/doc.go similarity index 100% rename from internal/packagegrant/doc.go rename to internal/platform/packagegrant/doc.go diff --git a/internal/packagegrant/strip_other.go b/internal/platform/packagegrant/strip_other.go similarity index 100% rename from internal/packagegrant/strip_other.go rename to internal/platform/packagegrant/strip_other.go diff --git a/internal/packagegrant/strip_windows.go b/internal/platform/packagegrant/strip_windows.go similarity index 100% rename from internal/packagegrant/strip_windows.go rename to internal/platform/packagegrant/strip_windows.go diff --git a/internal/packagegrant/strip_windows_test.go b/internal/platform/packagegrant/strip_windows_test.go similarity index 100% rename from internal/packagegrant/strip_windows_test.go rename to internal/platform/packagegrant/strip_windows_test.go diff --git a/internal/releaseasset/cache.go b/internal/platform/releaseasset/cache.go similarity index 100% rename from internal/releaseasset/cache.go rename to internal/platform/releaseasset/cache.go diff --git a/internal/releaseasset/cache_test.go b/internal/platform/releaseasset/cache_test.go similarity index 100% rename from internal/releaseasset/cache_test.go rename to internal/platform/releaseasset/cache_test.go diff --git a/internal/releaseasset/cli.go b/internal/platform/releaseasset/cli.go similarity index 99% rename from internal/releaseasset/cli.go rename to internal/platform/releaseasset/cli.go index 69cdbd679e..da68cbfb6d 100644 --- a/internal/releaseasset/cli.go +++ b/internal/platform/releaseasset/cli.go @@ -21,7 +21,7 @@ import ( "regexp" "strings" - "reasonix/internal/redirectguard" + "reasonix/internal/safety/redirectguard" ) const ( diff --git a/internal/releaseasset/cli_test.go b/internal/platform/releaseasset/cli_test.go similarity index 100% rename from internal/releaseasset/cli_test.go rename to internal/platform/releaseasset/cli_test.go diff --git a/internal/remote/agent.go b/internal/platform/remote/agent.go similarity index 100% rename from internal/remote/agent.go rename to internal/platform/remote/agent.go diff --git a/internal/remote/agent_test.go b/internal/platform/remote/agent_test.go similarity index 98% rename from internal/remote/agent_test.go rename to internal/platform/remote/agent_test.go index 133918a5c2..cd5e1be2ab 100644 --- a/internal/remote/agent_test.go +++ b/internal/platform/remote/agent_test.go @@ -11,8 +11,8 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" - "reasonix/internal/remote/sshtest" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote/sshtest" ) // keyringDialer serves an in-memory agent over a pipe. Where the real agent diff --git a/internal/remote/agent_unix.go b/internal/platform/remote/agent_unix.go similarity index 100% rename from internal/remote/agent_unix.go rename to internal/platform/remote/agent_unix.go diff --git a/internal/remote/agent_windows.go b/internal/platform/remote/agent_windows.go similarity index 100% rename from internal/remote/agent_windows.go rename to internal/platform/remote/agent_windows.go diff --git a/internal/remote/attach/attach.go b/internal/platform/remote/attach/attach.go similarity index 98% rename from internal/remote/attach/attach.go rename to internal/platform/remote/attach/attach.go index 985f061422..d540190101 100644 --- a/internal/remote/attach/attach.go +++ b/internal/platform/remote/attach/attach.go @@ -16,11 +16,11 @@ import ( "strings" "sync" - "reasonix/internal/config" - "reasonix/internal/releaseasset" - "reasonix/internal/remote" - "reasonix/internal/remote/bootstrap" - "reasonix/internal/remote/forward" + "reasonix/internal/contract/config" + "reasonix/internal/platform/releaseasset" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/bootstrap" + "reasonix/internal/platform/remote/forward" ) // Broker is this machine's provider broker: the loopback address it listens on diff --git a/internal/remote/attach/attach_test.go b/internal/platform/remote/attach/attach_test.go similarity index 98% rename from internal/remote/attach/attach_test.go rename to internal/platform/remote/attach/attach_test.go index d80df073a9..a469785c20 100644 --- a/internal/remote/attach/attach_test.go +++ b/internal/platform/remote/attach/attach_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "reasonix/internal/remote" - "reasonix/internal/remote/bootstrap" - "reasonix/internal/remote/sshtest" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/bootstrap" + "reasonix/internal/platform/remote/sshtest" ) var portFileArg = regexp.MustCompile(`--port-file '([^']*)'`) diff --git a/internal/remote/attach/browse.go b/internal/platform/remote/attach/browse.go similarity index 98% rename from internal/remote/attach/browse.go rename to internal/platform/remote/attach/browse.go index c1d16de9d8..c63c25e7e8 100644 --- a/internal/remote/attach/browse.go +++ b/internal/platform/remote/attach/browse.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/platform/remote/sftpfs" ) // browseLinger keeps a connection the picker opened alive past its answer. diff --git a/internal/remote/attach/browse_test.go b/internal/platform/remote/attach/browse_test.go similarity index 98% rename from internal/remote/attach/browse_test.go rename to internal/platform/remote/attach/browse_test.go index 8be85c84fb..f16616eae2 100644 --- a/internal/remote/attach/browse_test.go +++ b/internal/platform/remote/attach/browse_test.go @@ -9,9 +9,9 @@ import ( "sync/atomic" "testing" - "reasonix/internal/remote" - "reasonix/internal/remote/sftpfs" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/sftpfs" ) // sameFarPath reports whether two spellings name one directory. A temp dir is diff --git a/internal/remote/attach/dial.go b/internal/platform/remote/attach/dial.go similarity index 95% rename from internal/remote/attach/dial.go rename to internal/platform/remote/attach/dial.go index 5b69324c70..f75f4ec400 100644 --- a/internal/remote/attach/dial.go +++ b/internal/platform/remote/attach/dial.go @@ -3,9 +3,9 @@ package attach import ( "fmt" - "reasonix/internal/config" - "reasonix/internal/netclient" - "reasonix/internal/remote" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" + "reasonix/internal/platform/remote" ) // Prompts is the interactivity a frontend supplies — a terminal in the CLI, a diff --git a/internal/remote/attach/probe.go b/internal/platform/remote/attach/probe.go similarity index 96% rename from internal/remote/attach/probe.go rename to internal/platform/remote/attach/probe.go index 3dd45501b7..8784fefa9a 100644 --- a/internal/remote/attach/probe.go +++ b/internal/platform/remote/attach/probe.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "reasonix/internal/remote/bootstrap" + "reasonix/internal/platform/remote/bootstrap" ) // Probe reads what a first connect to host would depend on. Like Browse it diff --git a/internal/remote/auth.go b/internal/platform/remote/auth.go similarity index 100% rename from internal/remote/auth.go rename to internal/platform/remote/auth.go diff --git a/internal/remote/backoff_test.go b/internal/platform/remote/backoff_test.go similarity index 100% rename from internal/remote/backoff_test.go rename to internal/platform/remote/backoff_test.go diff --git a/internal/remote/bootstrap/bootstrap.go b/internal/platform/remote/bootstrap/bootstrap.go similarity index 99% rename from internal/remote/bootstrap/bootstrap.go rename to internal/platform/remote/bootstrap/bootstrap.go index d06a89dbf8..dbf4a0ea21 100644 --- a/internal/remote/bootstrap/bootstrap.go +++ b/internal/platform/remote/bootstrap/bootstrap.go @@ -19,9 +19,9 @@ import ( "strings" "time" - "reasonix/internal/releaseasset" - "reasonix/internal/remote" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/platform/releaseasset" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/sftpfs" ) // Conn is the subset of *remote.Client bootstrap needs. *remote.Client diff --git a/internal/remote/bootstrap/bootstrap_pure_test.go b/internal/platform/remote/bootstrap/bootstrap_pure_test.go similarity index 99% rename from internal/remote/bootstrap/bootstrap_pure_test.go rename to internal/platform/remote/bootstrap/bootstrap_pure_test.go index 7ba9f7adc6..4acab1e17e 100644 --- a/internal/remote/bootstrap/bootstrap_pure_test.go +++ b/internal/platform/remote/bootstrap/bootstrap_pure_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/remote" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/sftpfs" ) func TestParseUname(t *testing.T) { diff --git a/internal/remote/bootstrap/ensure_test.go b/internal/platform/remote/bootstrap/ensure_test.go similarity index 99% rename from internal/remote/bootstrap/ensure_test.go rename to internal/platform/remote/bootstrap/ensure_test.go index c6caee296b..eef0431b07 100644 --- a/internal/remote/bootstrap/ensure_test.go +++ b/internal/platform/remote/bootstrap/ensure_test.go @@ -13,10 +13,10 @@ import ( "golang.org/x/crypto/ssh" - "reasonix/internal/remote" - "reasonix/internal/remote/sftpfs" - "reasonix/internal/remote/sshtest" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote" + "reasonix/internal/platform/remote/sftpfs" + "reasonix/internal/platform/remote/sshtest" ) // fakeConn scripts exec responses and shares a real sftpfs.FS backed by an diff --git a/internal/remote/bootstrap/errors.go b/internal/platform/remote/bootstrap/errors.go similarity index 100% rename from internal/remote/bootstrap/errors.go rename to internal/platform/remote/bootstrap/errors.go diff --git a/internal/remote/bootstrap/fetch.go b/internal/platform/remote/bootstrap/fetch.go similarity index 98% rename from internal/remote/bootstrap/fetch.go rename to internal/platform/remote/bootstrap/fetch.go index a51ac6b3c5..5155833bd4 100644 --- a/internal/remote/bootstrap/fetch.go +++ b/internal/platform/remote/bootstrap/fetch.go @@ -3,7 +3,7 @@ package bootstrap import ( "strings" - "reasonix/internal/releaseasset" + "reasonix/internal/platform/releaseasset" ) // FetchCommand builds the `sh -c` script that has the remote download its own diff --git a/internal/remote/bootstrap/fetch_live_test.go b/internal/platform/remote/bootstrap/fetch_live_test.go similarity index 98% rename from internal/remote/bootstrap/fetch_live_test.go rename to internal/platform/remote/bootstrap/fetch_live_test.go index 8bfb907e59..29b37e2694 100644 --- a/internal/remote/bootstrap/fetch_live_test.go +++ b/internal/platform/remote/bootstrap/fetch_live_test.go @@ -15,8 +15,8 @@ import ( "runtime" "testing" - "reasonix/internal/releaseasset" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/releaseasset" ) // fakeKernel is a stand-in for the released CLI: it answers the two questions diff --git a/internal/remote/bootstrap/fetch_test.go b/internal/platform/remote/bootstrap/fetch_test.go similarity index 99% rename from internal/remote/bootstrap/fetch_test.go rename to internal/platform/remote/bootstrap/fetch_test.go index 3c55d561ef..7384ac3b13 100644 --- a/internal/remote/bootstrap/fetch_test.go +++ b/internal/platform/remote/bootstrap/fetch_test.go @@ -17,8 +17,8 @@ import ( "strings" "testing" - "reasonix/internal/releaseasset" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/releaseasset" ) // releaseTarGz builds an archive shaped like a published one: the executable diff --git a/internal/remote/bootstrap/hardening_test.go b/internal/platform/remote/bootstrap/hardening_test.go similarity index 98% rename from internal/remote/bootstrap/hardening_test.go rename to internal/platform/remote/bootstrap/hardening_test.go index a49a0b5767..e82efc861b 100644 --- a/internal/remote/bootstrap/hardening_test.go +++ b/internal/platform/remote/bootstrap/hardening_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/remote" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote" ) func TestEnsureServeRejectsStalePortFile(t *testing.T) { diff --git a/internal/remote/bootstrap/install.go b/internal/platform/remote/bootstrap/install.go similarity index 99% rename from internal/remote/bootstrap/install.go rename to internal/platform/remote/bootstrap/install.go index d86ecad039..b0f6ae78f9 100644 --- a/internal/remote/bootstrap/install.go +++ b/internal/platform/remote/bootstrap/install.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "reasonix/internal/releaseasset" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/platform/releaseasset" + "reasonix/internal/platform/remote/sftpfs" ) // autoRouteOrder is the order auto tries a machine in, and the only place that diff --git a/internal/remote/bootstrap/launch.go b/internal/platform/remote/bootstrap/launch.go similarity index 100% rename from internal/remote/bootstrap/launch.go rename to internal/platform/remote/bootstrap/launch.go diff --git a/internal/remote/bootstrap/lock.go b/internal/platform/remote/bootstrap/lock.go similarity index 98% rename from internal/remote/bootstrap/lock.go rename to internal/platform/remote/bootstrap/lock.go index 090db4c485..4235bdeafa 100644 --- a/internal/remote/bootstrap/lock.go +++ b/internal/platform/remote/bootstrap/lock.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/platform/remote/sftpfs" ) const ( diff --git a/internal/remote/bootstrap/platform.go b/internal/platform/remote/bootstrap/platform.go similarity index 100% rename from internal/remote/bootstrap/platform.go rename to internal/platform/remote/bootstrap/platform.go diff --git a/internal/remote/bootstrap/posixshell.go b/internal/platform/remote/bootstrap/posixshell.go similarity index 95% rename from internal/remote/bootstrap/posixshell.go rename to internal/platform/remote/bootstrap/posixshell.go index dc9d0b58e9..b4bed04b6a 100644 --- a/internal/remote/bootstrap/posixshell.go +++ b/internal/platform/remote/bootstrap/posixshell.go @@ -3,8 +3,8 @@ package bootstrap import ( "context" - "reasonix/internal/releaseasset" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/platform/releaseasset" + "reasonix/internal/platform/remote/sftpfs" ) // posixShell speaks to Linux and macOS remotes. The commands themselves stay diff --git a/internal/remote/bootstrap/probe.go b/internal/platform/remote/bootstrap/probe.go similarity index 99% rename from internal/remote/bootstrap/probe.go rename to internal/platform/remote/bootstrap/probe.go index d3b9e4100e..5a3a20afdb 100644 --- a/internal/remote/bootstrap/probe.go +++ b/internal/platform/remote/bootstrap/probe.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/releaseasset" + "reasonix/internal/platform/releaseasset" ) // Routes the auto strategy takes that are not serve_install values — nobody diff --git a/internal/remote/bootstrap/probe_test.go b/internal/platform/remote/bootstrap/probe_test.go similarity index 98% rename from internal/remote/bootstrap/probe_test.go rename to internal/platform/remote/bootstrap/probe_test.go index 2b5cc1845a..7d5f8292cb 100644 --- a/internal/remote/bootstrap/probe_test.go +++ b/internal/platform/remote/bootstrap/probe_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/remote" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote" ) // answers is one machine's replies, keyed by what the probe looks for. diff --git a/internal/remote/bootstrap/remoteos.go b/internal/platform/remote/bootstrap/remoteos.go similarity index 97% rename from internal/remote/bootstrap/remoteos.go rename to internal/platform/remote/bootstrap/remoteos.go index 0411084530..0468b25c4b 100644 --- a/internal/remote/bootstrap/remoteos.go +++ b/internal/platform/remote/bootstrap/remoteos.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "reasonix/internal/releaseasset" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/platform/releaseasset" + "reasonix/internal/platform/remote/sftpfs" ) // remoteOS is everything this package has to say to a machine that is not this diff --git a/internal/remote/bootstrap/state.go b/internal/platform/remote/bootstrap/state.go similarity index 98% rename from internal/remote/bootstrap/state.go rename to internal/platform/remote/bootstrap/state.go index 5ee2cba440..5553036e98 100644 --- a/internal/remote/bootstrap/state.go +++ b/internal/platform/remote/bootstrap/state.go @@ -5,7 +5,7 @@ import ( "path" "time" - "reasonix/internal/store" + "reasonix/internal/state/store" ) // ServeState is the JSON record a bootstrapped serve leaves on the remote host diff --git a/internal/remote/bootstrap/state_test.go b/internal/platform/remote/bootstrap/state_test.go similarity index 100% rename from internal/remote/bootstrap/state_test.go rename to internal/platform/remote/bootstrap/state_test.go diff --git a/internal/remote/bootstrap/windowsshell.go b/internal/platform/remote/bootstrap/windowsshell.go similarity index 98% rename from internal/remote/bootstrap/windowsshell.go rename to internal/platform/remote/bootstrap/windowsshell.go index e47da17d84..3a82ee6fa2 100644 --- a/internal/remote/bootstrap/windowsshell.go +++ b/internal/platform/remote/bootstrap/windowsshell.go @@ -7,8 +7,8 @@ import ( "strings" "unicode/utf16" - "reasonix/internal/releaseasset" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/platform/releaseasset" + "reasonix/internal/platform/remote/sftpfs" ) // windowsShell speaks to Windows remotes through PowerShell. Every command is diff --git a/internal/remote/bootstrap/windowsshell_test.go b/internal/platform/remote/bootstrap/windowsshell_test.go similarity index 100% rename from internal/remote/bootstrap/windowsshell_test.go rename to internal/platform/remote/bootstrap/windowsshell_test.go diff --git a/internal/remote/client.go b/internal/platform/remote/client.go similarity index 98% rename from internal/remote/client.go rename to internal/platform/remote/client.go index 08912ede61..fedeee4ba1 100644 --- a/internal/remote/client.go +++ b/internal/platform/remote/client.go @@ -11,9 +11,9 @@ import ( "golang.org/x/crypto/ssh" - "reasonix/internal/netclient" - "reasonix/internal/remote/forward" - "reasonix/internal/remote/sftpfs" + "reasonix/internal/base/netclient" + "reasonix/internal/platform/remote/forward" + "reasonix/internal/platform/remote/sftpfs" ) // Options configures a Client. Host, Auth, and HostKeys are required; the rest diff --git a/internal/remote/client_agent_unix_test.go b/internal/platform/remote/client_agent_unix_test.go similarity index 97% rename from internal/remote/client_agent_unix_test.go rename to internal/platform/remote/client_agent_unix_test.go index dc7ed84893..7bf3a1fb56 100644 --- a/internal/remote/client_agent_unix_test.go +++ b/internal/platform/remote/client_agent_unix_test.go @@ -13,8 +13,8 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" - "reasonix/internal/remote/sshtest" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote/sshtest" ) func TestClientFallsBackFromEmptyAgentToIdentityFile(t *testing.T) { diff --git a/internal/remote/client_test.go b/internal/platform/remote/client_test.go similarity index 99% rename from internal/remote/client_test.go rename to internal/platform/remote/client_test.go index c333a0e1ec..9c7cd52ff8 100644 --- a/internal/remote/client_test.go +++ b/internal/platform/remote/client_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "reasonix/internal/remote/sshtest" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote/sshtest" ) // managedOnlyPolicy points the host-key policy at an isolated managed file and diff --git a/internal/remote/dial.go b/internal/platform/remote/dial.go similarity index 99% rename from internal/remote/dial.go rename to internal/platform/remote/dial.go index da34b73093..fd4d1681ff 100644 --- a/internal/remote/dial.go +++ b/internal/platform/remote/dial.go @@ -9,7 +9,7 @@ import ( "golang.org/x/crypto/ssh" - "reasonix/internal/netclient" + "reasonix/internal/base/netclient" ) // dialConfig carries everything a single dial (or one hop of a jump chain) diff --git a/internal/remote/dial_hardening_test.go b/internal/platform/remote/dial_hardening_test.go similarity index 99% rename from internal/remote/dial_hardening_test.go rename to internal/platform/remote/dial_hardening_test.go index 980e56293c..17e7b8a13a 100644 --- a/internal/remote/dial_hardening_test.go +++ b/internal/platform/remote/dial_hardening_test.go @@ -6,7 +6,7 @@ import ( "net" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" "time" ) diff --git a/internal/remote/dial_test.go b/internal/platform/remote/dial_test.go similarity index 100% rename from internal/remote/dial_test.go rename to internal/platform/remote/dial_test.go diff --git a/internal/remote/forward/addrinuse.go b/internal/platform/remote/forward/addrinuse.go similarity index 100% rename from internal/remote/forward/addrinuse.go rename to internal/platform/remote/forward/addrinuse.go diff --git a/internal/remote/forward/addrinuse_windows.go b/internal/platform/remote/forward/addrinuse_windows.go similarity index 100% rename from internal/remote/forward/addrinuse_windows.go rename to internal/platform/remote/forward/addrinuse_windows.go diff --git a/internal/remote/forward/forward.go b/internal/platform/remote/forward/forward.go similarity index 100% rename from internal/remote/forward/forward.go rename to internal/platform/remote/forward/forward.go diff --git a/internal/remote/forward/forward_test.go b/internal/platform/remote/forward/forward_test.go similarity index 100% rename from internal/remote/forward/forward_test.go rename to internal/platform/remote/forward/forward_test.go diff --git a/internal/remote/forward/set.go b/internal/platform/remote/forward/set.go similarity index 100% rename from internal/remote/forward/set.go rename to internal/platform/remote/forward/set.go diff --git a/internal/remote/forward/set_test.go b/internal/platform/remote/forward/set_test.go similarity index 99% rename from internal/remote/forward/set_test.go rename to internal/platform/remote/forward/set_test.go index 090d1da649..8101642ef2 100644 --- a/internal/remote/forward/set_test.go +++ b/internal/platform/remote/forward/set_test.go @@ -10,7 +10,7 @@ import ( "golang.org/x/crypto/ssh" - "reasonix/internal/remote/sshtest" + "reasonix/internal/platform/remote/sshtest" ) // dialSSHClient connects to the sshtest server as a real ssh client. diff --git a/internal/remote/host.go b/internal/platform/remote/host.go similarity index 99% rename from internal/remote/host.go rename to internal/platform/remote/host.go index 6106d531b5..e884967c14 100644 --- a/internal/remote/host.go +++ b/internal/platform/remote/host.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // ResolvedHost is a fully resolved dial target: explicit [remote] TOML fields diff --git a/internal/remote/host_test.go b/internal/platform/remote/host_test.go similarity index 98% rename from internal/remote/host_test.go rename to internal/platform/remote/host_test.go index 0e019becb1..f15dd7fce2 100644 --- a/internal/remote/host_test.go +++ b/internal/platform/remote/host_test.go @@ -3,7 +3,7 @@ package remote import ( "testing" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func TestParseTarget(t *testing.T) { diff --git a/internal/remote/jump_resolve_test.go b/internal/platform/remote/jump_resolve_test.go similarity index 96% rename from internal/remote/jump_resolve_test.go rename to internal/platform/remote/jump_resolve_test.go index 802717f3a9..cedd77d2fb 100644 --- a/internal/remote/jump_resolve_test.go +++ b/internal/platform/remote/jump_resolve_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) // This binds two things: that ResolveJumpHosts reads configured aliases and diff --git a/internal/remote/knownhosts.go b/internal/platform/remote/knownhosts.go similarity index 100% rename from internal/remote/knownhosts.go rename to internal/platform/remote/knownhosts.go diff --git a/internal/remote/knownhosts_error_test.go b/internal/platform/remote/knownhosts_error_test.go similarity index 100% rename from internal/remote/knownhosts_error_test.go rename to internal/platform/remote/knownhosts_error_test.go diff --git a/internal/remote/knownhosts_test.go b/internal/platform/remote/knownhosts_test.go similarity index 99% rename from internal/remote/knownhosts_test.go rename to internal/platform/remote/knownhosts_test.go index ce91054996..c63a837c03 100644 --- a/internal/remote/knownhosts_test.go +++ b/internal/platform/remote/knownhosts_test.go @@ -19,8 +19,8 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/knownhosts" - "reasonix/internal/remote/sshtest" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote/sshtest" ) func TestNewSSHClientPrefersRecordedHostKeyAlgorithm(t *testing.T) { diff --git a/internal/remote/paths.go b/internal/platform/remote/paths.go similarity index 87% rename from internal/remote/paths.go rename to internal/platform/remote/paths.go index 38a3ff99d9..cc9d7fd653 100644 --- a/internal/remote/paths.go +++ b/internal/platform/remote/paths.go @@ -1,6 +1,6 @@ package remote -import "reasonix/internal/config" +import "reasonix/internal/contract/config" // defaultManagedKnownHosts is the Reasonix-managed known_hosts path. It is a // thin indirection over config so tests can leave HostKeyPolicy.ManagedPath diff --git a/internal/remote/reconnect_test.go b/internal/platform/remote/reconnect_test.go similarity index 99% rename from internal/remote/reconnect_test.go rename to internal/platform/remote/reconnect_test.go index f2e2f332a4..fa47c98933 100644 --- a/internal/remote/reconnect_test.go +++ b/internal/platform/remote/reconnect_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/remote/sshtest" + "reasonix/internal/platform/remote/sshtest" ) func deterministicRand() *rand.Rand { return rand.New(rand.NewPCG(uint64(1), uint64(1))) } diff --git a/internal/remote/remote.go b/internal/platform/remote/remote.go similarity index 98% rename from internal/remote/remote.go rename to internal/platform/remote/remote.go index 3c45529640..87d7984702 100644 --- a/internal/remote/remote.go +++ b/internal/platform/remote/remote.go @@ -4,7 +4,7 @@ // a supervised connection with keepalive and exponential-backoff reconnect, // shared SFTP access, and port-forward lifecycle. The agent itself never runs // through this package — remote workspaces are driven by a `reasonix serve` -// process bootstrapped on the remote host (internal/remote/bootstrap) and +// process bootstrapped on the remote host (internal/platform/remote/bootstrap) and // reached through a forwarded loopback port. // // The package is frontend-agnostic: all interactivity flows through callbacks diff --git a/internal/remote/sftpfs/detect.go b/internal/platform/remote/sftpfs/detect.go similarity index 100% rename from internal/remote/sftpfs/detect.go rename to internal/platform/remote/sftpfs/detect.go diff --git a/internal/remote/sftpfs/detect_test.go b/internal/platform/remote/sftpfs/detect_test.go similarity index 100% rename from internal/remote/sftpfs/detect_test.go rename to internal/platform/remote/sftpfs/detect_test.go diff --git a/internal/remote/sftpfs/sftpfs.go b/internal/platform/remote/sftpfs/sftpfs.go similarity index 100% rename from internal/remote/sftpfs/sftpfs.go rename to internal/platform/remote/sftpfs/sftpfs.go diff --git a/internal/remote/sftpfs/sftpfs_test.go b/internal/platform/remote/sftpfs/sftpfs_test.go similarity index 98% rename from internal/remote/sftpfs/sftpfs_test.go rename to internal/platform/remote/sftpfs/sftpfs_test.go index bd25dba775..d739c2c551 100644 --- a/internal/remote/sftpfs/sftpfs_test.go +++ b/internal/platform/remote/sftpfs/sftpfs_test.go @@ -12,8 +12,8 @@ import ( "golang.org/x/crypto/ssh" - "reasonix/internal/remote/sshtest" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/remote/sshtest" ) func dialFS(t *testing.T, root string) *FS { diff --git a/internal/remote/sshconfig.go b/internal/platform/remote/sshconfig.go similarity index 100% rename from internal/remote/sshconfig.go rename to internal/platform/remote/sshconfig.go diff --git a/internal/remote/sshconfig_test.go b/internal/platform/remote/sshconfig_test.go similarity index 99% rename from internal/remote/sshconfig_test.go rename to internal/platform/remote/sshconfig_test.go index 412c7a7519..7d4b663ae0 100644 --- a/internal/remote/sshconfig_test.go +++ b/internal/platform/remote/sshconfig_test.go @@ -9,8 +9,8 @@ import ( "runtime" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) const sampleSSHConfig = ` diff --git a/internal/remote/sshtest/keys.go b/internal/platform/remote/sshtest/keys.go similarity index 100% rename from internal/remote/sshtest/keys.go rename to internal/platform/remote/sshtest/keys.go diff --git a/internal/remote/sshtest/sshtest.go b/internal/platform/remote/sshtest/sshtest.go similarity index 100% rename from internal/remote/sshtest/sshtest.go rename to internal/platform/remote/sshtest/sshtest.go diff --git a/internal/remote/status.go b/internal/platform/remote/status.go similarity index 100% rename from internal/remote/status.go rename to internal/platform/remote/status.go diff --git a/internal/repair/apply_failure.go b/internal/platform/repair/apply_failure.go similarity index 99% rename from internal/repair/apply_failure.go rename to internal/platform/repair/apply_failure.go index 0afd7aeb0e..5b26d00dba 100644 --- a/internal/repair/apply_failure.go +++ b/internal/platform/repair/apply_failure.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" ) // UpdateApplyFailure records that an update installer failed after the desktop diff --git a/internal/repair/config.go b/internal/platform/repair/config.go similarity index 99% rename from internal/repair/config.go rename to internal/platform/repair/config.go index 5c7629032e..d89d8ab367 100644 --- a/internal/repair/config.go +++ b/internal/platform/repair/config.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" ) type ConfigCheck struct { diff --git a/internal/repair/config_test.go b/internal/platform/repair/config_test.go similarity index 99% rename from internal/repair/config_test.go rename to internal/platform/repair/config_test.go index 402388d9db..be2dd5eacc 100644 --- a/internal/repair/config_test.go +++ b/internal/platform/repair/config_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func TestInspectInvalidProjectConfigIsReadOnlyByDefault(t *testing.T) { diff --git a/internal/repair/derived.go b/internal/platform/repair/derived.go similarity index 99% rename from internal/repair/derived.go rename to internal/platform/repair/derived.go index 463d9020ad..9e39ca793c 100644 --- a/internal/repair/derived.go +++ b/internal/platform/repair/derived.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func RebuildDerivedState(target string) ([]string, error) { diff --git a/internal/repair/diagnose.go b/internal/platform/repair/diagnose.go similarity index 99% rename from internal/repair/diagnose.go rename to internal/platform/repair/diagnose.go index 581ff4bd8b..49d4b3271a 100644 --- a/internal/repair/diagnose.go +++ b/internal/platform/repair/diagnose.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/netclient" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" ) type DiagnosticFinding struct { diff --git a/internal/repair/diagnose_test.go b/internal/platform/repair/diagnose_test.go similarity index 98% rename from internal/repair/diagnose_test.go rename to internal/platform/repair/diagnose_test.go index 2f50bfa87f..2328d9d5af 100644 --- a/internal/repair/diagnose_test.go +++ b/internal/platform/repair/diagnose_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestDiagnoseFindsProviderPluginAndPermissionProblems(t *testing.T) { diff --git a/internal/repair/main_test.go b/internal/platform/repair/main_test.go similarity index 76% rename from internal/repair/main_test.go rename to internal/platform/repair/main_test.go index 78a38e3248..9bae4b1cce 100644 --- a/internal/repair/main_test.go +++ b/internal/platform/repair/main_test.go @@ -3,7 +3,7 @@ package repair import ( "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestMain(m *testing.M) { diff --git a/internal/repair/mutation_lock.go b/internal/platform/repair/mutation_lock.go similarity index 99% rename from internal/repair/mutation_lock.go rename to internal/platform/repair/mutation_lock.go index 4513052ea9..3beb598f73 100644 --- a/internal/repair/mutation_lock.go +++ b/internal/platform/repair/mutation_lock.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "reasonix/internal/config" - "reasonix/internal/filelock" + "reasonix/internal/base/filelock" + "reasonix/internal/contract/config" ) const repairMutationLockTimeout = 5 * time.Second diff --git a/internal/repair/open_regular_other.go b/internal/platform/repair/open_regular_other.go similarity index 100% rename from internal/repair/open_regular_other.go rename to internal/platform/repair/open_regular_other.go diff --git a/internal/repair/open_regular_unix.go b/internal/platform/repair/open_regular_unix.go similarity index 100% rename from internal/repair/open_regular_unix.go rename to internal/platform/repair/open_regular_unix.go diff --git a/internal/repair/open_regular_windows.go b/internal/platform/repair/open_regular_windows.go similarity index 100% rename from internal/repair/open_regular_windows.go rename to internal/platform/repair/open_regular_windows.go diff --git a/internal/repair/path_case_darwin.go b/internal/platform/repair/path_case_darwin.go similarity index 100% rename from internal/repair/path_case_darwin.go rename to internal/platform/repair/path_case_darwin.go diff --git a/internal/repair/path_case_darwin_test.go b/internal/platform/repair/path_case_darwin_test.go similarity index 97% rename from internal/repair/path_case_darwin_test.go rename to internal/platform/repair/path_case_darwin_test.go index dd1f9460d0..604b641951 100644 --- a/internal/repair/path_case_darwin_test.go +++ b/internal/platform/repair/path_case_darwin_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestPlatformRepairPathCaseInsensitiveMatchesDirectoryLookup(t *testing.T) { diff --git a/internal/repair/path_case_other.go b/internal/platform/repair/path_case_other.go similarity index 100% rename from internal/repair/path_case_other.go rename to internal/platform/repair/path_case_other.go diff --git a/internal/repair/path_case_platform.go b/internal/platform/repair/path_case_platform.go similarity index 100% rename from internal/repair/path_case_platform.go rename to internal/platform/repair/path_case_platform.go diff --git a/internal/repair/path_case_windows.go b/internal/platform/repair/path_case_windows.go similarity index 100% rename from internal/repair/path_case_windows.go rename to internal/platform/repair/path_case_windows.go diff --git a/internal/repair/path_unicode_other.go b/internal/platform/repair/path_unicode_other.go similarity index 100% rename from internal/repair/path_unicode_other.go rename to internal/platform/repair/path_unicode_other.go diff --git a/internal/repair/plan.go b/internal/platform/repair/plan.go similarity index 99% rename from internal/repair/plan.go rename to internal/platform/repair/plan.go index bf753ea6f3..9136ee5087 100644 --- a/internal/repair/plan.go +++ b/internal/platform/repair/plan.go @@ -17,8 +17,8 @@ import ( "strings" "time" - "reasonix/internal/config" - textdiff "reasonix/internal/diff" + textdiff "reasonix/internal/base/diff" + "reasonix/internal/contract/config" ) const RepairPlanSchemaVersion = 1 diff --git a/internal/repair/plan_test.go b/internal/platform/repair/plan_test.go similarity index 99% rename from internal/repair/plan_test.go rename to internal/platform/repair/plan_test.go index d137eba6f6..7869058cc0 100644 --- a/internal/repair/plan_test.go +++ b/internal/platform/repair/plan_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "reasonix/internal/fileutil" - "reasonix/internal/testenv" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/testenv" ) func repairMutationTestKey(path string) string { diff --git a/internal/repair/process_other.go b/internal/platform/repair/process_other.go similarity index 100% rename from internal/repair/process_other.go rename to internal/platform/repair/process_other.go diff --git a/internal/repair/process_unix.go b/internal/platform/repair/process_unix.go similarity index 100% rename from internal/repair/process_unix.go rename to internal/platform/repair/process_unix.go diff --git a/internal/repair/process_windows.go b/internal/platform/repair/process_windows.go similarity index 100% rename from internal/repair/process_windows.go rename to internal/platform/repair/process_windows.go diff --git a/internal/repair/provenance_test.go b/internal/platform/repair/provenance_test.go similarity index 98% rename from internal/repair/provenance_test.go rename to internal/platform/repair/provenance_test.go index 81c16d7a9b..36921a471b 100644 --- a/internal/repair/provenance_test.go +++ b/internal/platform/repair/provenance_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestLastKnownGoodProvenancePrefersRecordedMetadata(t *testing.T) { diff --git a/internal/repair/rename_noreplace_darwin.go b/internal/platform/repair/rename_noreplace_darwin.go similarity index 100% rename from internal/repair/rename_noreplace_darwin.go rename to internal/platform/repair/rename_noreplace_darwin.go diff --git a/internal/repair/rename_noreplace_linux.go b/internal/platform/repair/rename_noreplace_linux.go similarity index 100% rename from internal/repair/rename_noreplace_linux.go rename to internal/platform/repair/rename_noreplace_linux.go diff --git a/internal/repair/rename_noreplace_other.go b/internal/platform/repair/rename_noreplace_other.go similarity index 100% rename from internal/repair/rename_noreplace_other.go rename to internal/platform/repair/rename_noreplace_other.go diff --git a/internal/repair/rename_noreplace_windows.go b/internal/platform/repair/rename_noreplace_windows.go similarity index 100% rename from internal/repair/rename_noreplace_windows.go rename to internal/platform/repair/rename_noreplace_windows.go diff --git a/internal/repair/rename_noreplace_windows_test.go b/internal/platform/repair/rename_noreplace_windows_test.go similarity index 96% rename from internal/repair/rename_noreplace_windows_test.go rename to internal/platform/repair/rename_noreplace_windows_test.go index 0c7a8ff588..529a242bfd 100644 --- a/internal/repair/rename_noreplace_windows_test.go +++ b/internal/platform/repair/rename_noreplace_windows_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestRenameRepairNodeNoReplaceWindowsPreservesExistingDestination(t *testing.T) { diff --git a/internal/repair/snapshot.go b/internal/platform/repair/snapshot.go similarity index 99% rename from internal/repair/snapshot.go rename to internal/platform/repair/snapshot.go index 80c017cdfe..35e2750b98 100644 --- a/internal/repair/snapshot.go +++ b/internal/platform/repair/snapshot.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" ) const configSnapshotRetention = 5 diff --git a/internal/repair/startup.go b/internal/platform/repair/startup.go similarity index 98% rename from internal/repair/startup.go rename to internal/platform/repair/startup.go index f638cdaeba..d99047d68e 100644 --- a/internal/repair/startup.go +++ b/internal/platform/repair/startup.go @@ -6,8 +6,8 @@ import ( "path/filepath" "time" - "reasonix/internal/config" - "reasonix/internal/filelock" + "reasonix/internal/base/filelock" + "reasonix/internal/contract/config" ) // StartupState is the legacy startup-state.json shape written by v1.18-v1.19. diff --git a/internal/repair/startup_test.go b/internal/platform/repair/startup_test.go similarity index 98% rename from internal/repair/startup_test.go rename to internal/platform/repair/startup_test.go index 6d272b6793..1aeb1c0d8b 100644 --- a/internal/repair/startup_test.go +++ b/internal/platform/repair/startup_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeLegacyStartupState(t *testing.T, path, body string) { diff --git a/internal/repair/startup_windows_test.go b/internal/platform/repair/startup_windows_test.go similarity index 95% rename from internal/repair/startup_windows_test.go rename to internal/platform/repair/startup_windows_test.go index ba9dbc1058..f975b6ef6b 100644 --- a/internal/repair/startup_windows_test.go +++ b/internal/platform/repair/startup_windows_test.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestStartupTrackerWindowsHandleContentionReportsOnce(t *testing.T) { diff --git a/internal/repair/transaction.go b/internal/platform/repair/transaction.go similarity index 99% rename from internal/repair/transaction.go rename to internal/platform/repair/transaction.go index c0a2feb7b3..5af03b0101 100644 --- a/internal/repair/transaction.go +++ b/internal/platform/repair/transaction.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" ) type RepairChange struct { diff --git a/internal/repair/transaction_test.go b/internal/platform/repair/transaction_test.go similarity index 99% rename from internal/repair/transaction_test.go rename to internal/platform/repair/transaction_test.go index 1235be2e17..f7fd27b7c8 100644 --- a/internal/repair/transaction_test.go +++ b/internal/platform/repair/transaction_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func TestReadLastRepairAcceptsLegacyTransactionWithoutJournalFields(t *testing.T) { diff --git a/internal/repair/update.go b/internal/platform/repair/update.go similarity index 99% rename from internal/repair/update.go rename to internal/platform/repair/update.go index 04eecd05e9..a3e16d8e57 100644 --- a/internal/repair/update.go +++ b/internal/platform/repair/update.go @@ -18,9 +18,9 @@ import ( "sync" "time" - "reasonix/internal/config" - "reasonix/internal/filelock" - "reasonix/internal/fileutil" + "reasonix/internal/base/filelock" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" ) const updateTransactionVersion = 1 diff --git a/internal/repair/update_debris_test.go b/internal/platform/repair/update_debris_test.go similarity index 99% rename from internal/repair/update_debris_test.go rename to internal/platform/repair/update_debris_test.go index 3134a4434c..b781ad0f56 100644 --- a/internal/repair/update_debris_test.go +++ b/internal/platform/repair/update_debris_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // writePendingUpdateRaw drops arbitrary bytes where the transaction lives. diff --git a/internal/repair/update_file_claim_test.go b/internal/platform/repair/update_file_claim_test.go similarity index 99% rename from internal/repair/update_file_claim_test.go rename to internal/platform/repair/update_file_claim_test.go index d141e4e6d5..acfe9ed7ae 100644 --- a/internal/repair/update_file_claim_test.go +++ b/internal/platform/repair/update_file_claim_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func prepareTestFileUpdateClaim(t *testing.T) (*UpdateTransaction, string, []string) { diff --git a/internal/repair/update_handoff_commit_test.go b/internal/platform/repair/update_handoff_commit_test.go similarity index 100% rename from internal/repair/update_handoff_commit_test.go rename to internal/platform/repair/update_handoff_commit_test.go diff --git a/internal/repair/update_handoff_darwin_smoke_test.go b/internal/platform/repair/update_handoff_darwin_smoke_test.go similarity index 96% rename from internal/repair/update_handoff_darwin_smoke_test.go rename to internal/platform/repair/update_handoff_darwin_smoke_test.go index d1eb924ecf..2077464ebb 100644 --- a/internal/repair/update_handoff_darwin_smoke_test.go +++ b/internal/platform/repair/update_handoff_darwin_smoke_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestDarwinApplicationsOrphanBackupLifecycleSmoke is opt-in because it probes @@ -18,7 +18,7 @@ import ( // // Run with: // -// REASONIX_MACOS_APPLICATIONS_SMOKE=1 go test ./internal/repair \ +// REASONIX_MACOS_APPLICATIONS_SMOKE=1 go test ./internal/platform/repair \ // -run TestDarwinApplicationsOrphanBackupLifecycleSmoke -count=1 func TestDarwinApplicationsOrphanBackupLifecycleSmoke(t *testing.T) { if os.Getenv("REASONIX_MACOS_APPLICATIONS_SMOKE") != "1" { diff --git a/internal/repair/update_handoff_test.go b/internal/platform/repair/update_handoff_test.go similarity index 99% rename from internal/repair/update_handoff_test.go rename to internal/platform/repair/update_handoff_test.go index f49d971a24..fc25c3ad1b 100644 --- a/internal/repair/update_handoff_test.go +++ b/internal/platform/repair/update_handoff_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func prepareTestAppBundleHandoff(t *testing.T) (*UpdateTransaction, string) { diff --git a/internal/repair/update_health.go b/internal/platform/repair/update_health.go similarity index 100% rename from internal/repair/update_health.go rename to internal/platform/repair/update_health.go diff --git a/internal/repair/update_legacy.go b/internal/platform/repair/update_legacy.go similarity index 99% rename from internal/repair/update_legacy.go rename to internal/platform/repair/update_legacy.go index 4141365501..23358403e1 100644 --- a/internal/repair/update_legacy.go +++ b/internal/platform/repair/update_legacy.go @@ -11,8 +11,8 @@ import ( "golang.org/x/mod/semver" - "reasonix/internal/config" - "reasonix/internal/installlayout" + "reasonix/internal/contract/config" + "reasonix/internal/platform/installlayout" ) var supersededUpdateBeforeArchive = func(string) {} diff --git a/internal/repair/update_legacy_test.go b/internal/platform/repair/update_legacy_test.go similarity index 99% rename from internal/repair/update_legacy_test.go rename to internal/platform/repair/update_legacy_test.go index 768ddb6a79..29b899ed15 100644 --- a/internal/repair/update_legacy_test.go +++ b/internal/platform/repair/update_legacy_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/installlayout" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/platform/installlayout" ) type supersededUpdateFixture struct { diff --git a/internal/repair/update_lock_test.go b/internal/platform/repair/update_lock_test.go similarity index 99% rename from internal/repair/update_lock_test.go rename to internal/platform/repair/update_lock_test.go index d06ac8e76c..0ba42c623e 100644 --- a/internal/repair/update_lock_test.go +++ b/internal/platform/repair/update_lock_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestPendingUpdateRollbackExcludesConcurrentCommit pins the pending-update diff --git a/internal/repair/update_security_test.go b/internal/platform/repair/update_security_test.go similarity index 99% rename from internal/repair/update_security_test.go rename to internal/platform/repair/update_security_test.go index 592a777ac1..2250c06403 100644 --- a/internal/repair/update_security_test.go +++ b/internal/platform/repair/update_security_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestPendingUpdateRejectsTargetOutsideGuardInstall(t *testing.T) { diff --git a/internal/repair/update_test.go b/internal/platform/repair/update_test.go similarity index 99% rename from internal/repair/update_test.go rename to internal/platform/repair/update_test.go index e3cb381672..7ebb255adb 100644 --- a/internal/repair/update_test.go +++ b/internal/platform/repair/update_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func fileUpdateInstallReceiptsForTest(t *testing.T, tx *UpdateTransaction) []FileUpdateInstallReceipt { diff --git a/internal/repair/update_test_helpers_test.go b/internal/platform/repair/update_test_helpers_test.go similarity index 100% rename from internal/repair/update_test_helpers_test.go rename to internal/platform/repair/update_test_helpers_test.go diff --git a/internal/telemetry/client.go b/internal/platform/telemetry/client.go similarity index 98% rename from internal/telemetry/client.go rename to internal/platform/telemetry/client.go index 5a8b2f789f..eba132119e 100644 --- a/internal/telemetry/client.go +++ b/internal/platform/telemetry/client.go @@ -15,9 +15,9 @@ import ( "strings" "time" - "reasonix/internal/fileutil" - "reasonix/internal/netclient" - "reasonix/internal/surface" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/surface" ) var endpoint = "https://crash.reasonix.io/v1" diff --git a/internal/telemetry/client_test.go b/internal/platform/telemetry/client_test.go similarity index 98% rename from internal/telemetry/client_test.go rename to internal/platform/telemetry/client_test.go index 536e947dfb..9d4f616f9a 100644 --- a/internal/telemetry/client_test.go +++ b/internal/platform/telemetry/client_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/recovery" - "reasonix/internal/surface" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/runtime/recovery" ) type roundTripFunc func(*http.Request) (*http.Response, error) diff --git a/internal/telemetry/lease_test.go b/internal/platform/telemetry/lease_test.go similarity index 98% rename from internal/telemetry/lease_test.go rename to internal/platform/telemetry/lease_test.go index ccb8c0246e..ff5b4caa53 100644 --- a/internal/telemetry/lease_test.go +++ b/internal/platform/telemetry/lease_test.go @@ -3,7 +3,7 @@ package telemetry import ( "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) func has(t *testing.T, counts map[string]int, signal, bucket string) { diff --git a/internal/telemetry/payload.go b/internal/platform/telemetry/payload.go similarity index 100% rename from internal/telemetry/payload.go rename to internal/platform/telemetry/payload.go diff --git a/internal/telemetry/pending.go b/internal/platform/telemetry/pending.go similarity index 100% rename from internal/telemetry/pending.go rename to internal/platform/telemetry/pending.go diff --git a/internal/telemetry/policy.go b/internal/platform/telemetry/policy.go similarity index 100% rename from internal/telemetry/policy.go rename to internal/platform/telemetry/policy.go diff --git a/internal/telemetry/policy_test.go b/internal/platform/telemetry/policy_test.go similarity index 100% rename from internal/telemetry/policy_test.go rename to internal/platform/telemetry/policy_test.go diff --git a/internal/telemetry/sink.go b/internal/platform/telemetry/sink.go similarity index 98% rename from internal/telemetry/sink.go rename to internal/platform/telemetry/sink.go index 0b28dc90f0..935541bd8c 100644 --- a/internal/telemetry/sink.go +++ b/internal/platform/telemetry/sink.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "reasonix/internal/event" - "reasonix/internal/netclient" - "reasonix/internal/provider" - "reasonix/internal/recovery" - "reasonix/internal/surface" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/surface" + "reasonix/internal/runtime/recovery" ) type Options struct { diff --git a/internal/telemetry/sink_test.go b/internal/platform/telemetry/sink_test.go similarity index 98% rename from internal/telemetry/sink_test.go rename to internal/platform/telemetry/sink_test.go index 6d7be5b9a5..73aca13882 100644 --- a/internal/telemetry/sink_test.go +++ b/internal/platform/telemetry/sink_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) type readinessSink struct { diff --git a/internal/update/application_darwin.go b/internal/platform/update/application_darwin.go similarity index 100% rename from internal/update/application_darwin.go rename to internal/platform/update/application_darwin.go diff --git a/internal/update/apply.go b/internal/platform/update/apply.go similarity index 100% rename from internal/update/apply.go rename to internal/platform/update/apply.go diff --git a/internal/update/apply_darwin.go b/internal/platform/update/apply_darwin.go similarity index 99% rename from internal/update/apply_darwin.go rename to internal/platform/update/apply_darwin.go index 709318c0f6..69b089e6c7 100644 --- a/internal/update/apply_darwin.go +++ b/internal/platform/update/apply_darwin.go @@ -18,7 +18,7 @@ import ( "golang.org/x/sys/unix" - "reasonix/internal/repair" + "reasonix/internal/platform/repair" ) const ( diff --git a/internal/update/apply_darwin_stub.go b/internal/platform/update/apply_darwin_stub.go similarity index 100% rename from internal/update/apply_darwin_stub.go rename to internal/platform/update/apply_darwin_stub.go diff --git a/internal/update/apply_darwin_test.go b/internal/platform/update/apply_darwin_test.go similarity index 99% rename from internal/update/apply_darwin_test.go rename to internal/platform/update/apply_darwin_test.go index 65e031c6e1..6aef08251e 100644 --- a/internal/update/apply_darwin_test.go +++ b/internal/platform/update/apply_darwin_test.go @@ -15,9 +15,9 @@ import ( "golang.org/x/sys/unix" - "reasonix/internal/repair" + "reasonix/internal/platform/repair" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) // duplicateMacHandoffFD gives the in-process helper the same exclusive FD diff --git a/internal/update/apply_linux.go b/internal/platform/update/apply_linux.go similarity index 97% rename from internal/update/apply_linux.go rename to internal/platform/update/apply_linux.go index 7ff020be09..933431b0b1 100644 --- a/internal/update/apply_linux.go +++ b/internal/platform/update/apply_linux.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/installlayout" + "reasonix/internal/platform/installlayout" ) // apply publishes the tarball into a new version directory and swaps the diff --git a/internal/update/apply_linux_test.go b/internal/platform/update/apply_linux_test.go similarity index 98% rename from internal/update/apply_linux_test.go rename to internal/platform/update/apply_linux_test.go index 499ab664a7..87caf36bbf 100644 --- a/internal/update/apply_linux_test.go +++ b/internal/platform/update/apply_linux_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/installlayout" + "reasonix/internal/platform/installlayout" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) // The tarball still carries reasonix-guard for v1.18-v1.19 updaters reading the diff --git a/internal/update/apply_other.go b/internal/platform/update/apply_other.go similarity index 100% rename from internal/update/apply_other.go rename to internal/platform/update/apply_other.go diff --git a/internal/update/apply_windows.go b/internal/platform/update/apply_windows.go similarity index 100% rename from internal/update/apply_windows.go rename to internal/platform/update/apply_windows.go diff --git a/internal/update/cache.go b/internal/platform/update/cache.go similarity index 98% rename from internal/update/cache.go rename to internal/platform/update/cache.go index 56ecf29df9..eda88301aa 100644 --- a/internal/update/cache.go +++ b/internal/platform/update/cache.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/config" ) // Artifact kinds. Which one the cache holds is part of its identity: a .deb and diff --git a/internal/update/cache_test.go b/internal/platform/update/cache_test.go similarity index 99% rename from internal/update/cache_test.go rename to internal/platform/update/cache_test.go index b93e65ec0b..4f9c0af1d5 100644 --- a/internal/update/cache_test.go +++ b/internal/platform/update/cache_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) func sha256Hex(data []byte) string { diff --git a/internal/update/catalog_test.go b/internal/platform/update/catalog_test.go similarity index 100% rename from internal/update/catalog_test.go rename to internal/platform/update/catalog_test.go diff --git a/internal/update/contentrange.go b/internal/platform/update/contentrange.go similarity index 100% rename from internal/update/contentrange.go rename to internal/platform/update/contentrange.go diff --git a/internal/update/contentrange_test.go b/internal/platform/update/contentrange_test.go similarity index 100% rename from internal/update/contentrange_test.go rename to internal/platform/update/contentrange_test.go diff --git a/internal/update/deb.go b/internal/platform/update/deb.go similarity index 100% rename from internal/update/deb.go rename to internal/platform/update/deb.go diff --git a/internal/update/deb_linux.go b/internal/platform/update/deb_linux.go similarity index 100% rename from internal/update/deb_linux.go rename to internal/platform/update/deb_linux.go diff --git a/internal/update/deb_other.go b/internal/platform/update/deb_other.go similarity index 100% rename from internal/update/deb_other.go rename to internal/platform/update/deb_other.go diff --git a/internal/update/deb_test.go b/internal/platform/update/deb_test.go similarity index 100% rename from internal/update/deb_test.go rename to internal/platform/update/deb_test.go diff --git a/internal/update/download.go b/internal/platform/update/download.go similarity index 100% rename from internal/update/download.go rename to internal/platform/update/download.go diff --git a/internal/update/download_test.go b/internal/platform/update/download_test.go similarity index 99% rename from internal/update/download_test.go rename to internal/platform/update/download_test.go index b25f5f9f15..90546c6908 100644 --- a/internal/update/download_test.go +++ b/internal/platform/update/download_test.go @@ -13,7 +13,7 @@ import ( "aead.dev/minisign" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) // release is one published version as the catalog and its manifest describe it. diff --git a/internal/update/handoff_contract_test.go b/internal/platform/update/handoff_contract_test.go similarity index 92% rename from internal/update/handoff_contract_test.go rename to internal/platform/update/handoff_contract_test.go index bce84a0a3b..f90587b223 100644 --- a/internal/update/handoff_contract_test.go +++ b/internal/platform/update/handoff_contract_test.go @@ -21,7 +21,7 @@ var hostMains = []string{ // — the process that starts the helper is the one already installed. func TestEveryHostMainAnswersTheMacHandoff(t *testing.T) { for _, rel := range hostMains { - body, err := os.ReadFile(filepath.Join("..", "..", filepath.FromSlash(rel))) + body, err := os.ReadFile(filepath.Join("..", "..", "..", filepath.FromSlash(rel))) if err != nil { t.Errorf("%s: %v", rel, err) continue diff --git a/internal/update/hub.go b/internal/platform/update/hub.go similarity index 98% rename from internal/update/hub.go rename to internal/platform/update/hub.go index 90b644d753..0f866275d8 100644 --- a/internal/update/hub.go +++ b/internal/platform/update/hub.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/netclient" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" ) // StudioCatalog is Studio's own rollback catalog, published by diff --git a/internal/update/hub_catalog_test.go b/internal/platform/update/hub_catalog_test.go similarity index 100% rename from internal/update/hub_catalog_test.go rename to internal/platform/update/hub_catalog_test.go diff --git a/internal/update/hub_test.go b/internal/platform/update/hub_test.go similarity index 100% rename from internal/update/hub_test.go rename to internal/platform/update/hub_test.go diff --git a/internal/update/index.go b/internal/platform/update/index.go similarity index 100% rename from internal/update/index.go rename to internal/platform/update/index.go diff --git a/internal/update/index_test.go b/internal/platform/update/index_test.go similarity index 100% rename from internal/update/index_test.go rename to internal/platform/update/index_test.go diff --git a/internal/update/install.go b/internal/platform/update/install.go similarity index 100% rename from internal/update/install.go rename to internal/platform/update/install.go diff --git a/internal/update/install_args.go b/internal/platform/update/install_args.go similarity index 100% rename from internal/update/install_args.go rename to internal/platform/update/install_args.go diff --git a/internal/update/install_args_test.go b/internal/platform/update/install_args_test.go similarity index 97% rename from internal/update/install_args_test.go rename to internal/platform/update/install_args_test.go index 63ef2e879a..5ad757c247 100644 --- a/internal/update/install_args_test.go +++ b/internal/platform/update/install_args_test.go @@ -91,7 +91,7 @@ func TestWindowsUpdateRequiresObservedHelperHandoff(t *testing.T) { } // The helper is still built by Studio's release line and so still lives in // the desktop module; this contract spans both sides of that line. - helperData, err := os.ReadFile("../../desktop/cmd/update-helper/main_windows.go") + helperData, err := os.ReadFile("../../../desktop/cmd/update-helper/main_windows.go") if err != nil { t.Fatal(err) } diff --git a/internal/update/install_other.go b/internal/platform/update/install_other.go similarity index 93% rename from internal/update/install_other.go rename to internal/platform/update/install_other.go index a5dac39a87..7cdf2535b2 100644 --- a/internal/update/install_other.go +++ b/internal/platform/update/install_other.go @@ -5,7 +5,7 @@ package update import ( "os/exec" - "reasonix/internal/repair" + "reasonix/internal/platform/repair" ) // installerCommand exists only so the handoff compiles off Windows; the Windows diff --git a/internal/update/install_windows.go b/internal/platform/update/install_windows.go similarity index 99% rename from internal/update/install_windows.go rename to internal/platform/update/install_windows.go index 8d4ff765d8..4493c6103e 100644 --- a/internal/update/install_windows.go +++ b/internal/platform/update/install_windows.go @@ -21,8 +21,8 @@ import ( "golang.org/x/sys/windows" - "reasonix/internal/installlayout" - "reasonix/internal/repair" + "reasonix/internal/platform/installlayout" + "reasonix/internal/platform/repair" ) // resolveWindowsUpdateHelperSource finds the on-disk helper for the running diff --git a/internal/update/install_windows_test.go b/internal/platform/update/install_windows_test.go similarity index 98% rename from internal/update/install_windows_test.go rename to internal/platform/update/install_windows_test.go index 4100e0593b..d038563c6c 100644 --- a/internal/update/install_windows_test.go +++ b/internal/platform/update/install_windows_test.go @@ -14,9 +14,9 @@ import ( "golang.org/x/sys/windows" - "reasonix/internal/repair" + "reasonix/internal/platform/repair" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) func TestInstallerCommandShowsUpdateProgressAndPassesUnquotedDFlagLast(t *testing.T) { diff --git a/internal/update/installer_run_other.go b/internal/platform/update/installer_run_other.go similarity index 100% rename from internal/update/installer_run_other.go rename to internal/platform/update/installer_run_other.go diff --git a/internal/update/installer_run_windows.go b/internal/platform/update/installer_run_windows.go similarity index 100% rename from internal/update/installer_run_windows.go rename to internal/platform/update/installer_run_windows.go diff --git a/internal/update/installer_run_windows_test.go b/internal/platform/update/installer_run_windows_test.go similarity index 98% rename from internal/update/installer_run_windows_test.go rename to internal/platform/update/installer_run_windows_test.go index ad5390b415..ddd5303ecd 100644 --- a/internal/update/installer_run_windows_test.go +++ b/internal/platform/update/installer_run_windows_test.go @@ -11,7 +11,7 @@ import ( "golang.org/x/sys/windows" - "reasonix/internal/tempdir" + "reasonix/internal/base/tempdir" ) func TestRunInstallerStartErrorIsActionableAndPathSafe(t *testing.T) { diff --git a/internal/update/layout.go b/internal/platform/update/layout.go similarity index 98% rename from internal/update/layout.go rename to internal/platform/update/layout.go index 6c0e1bc97e..87df8d4851 100644 --- a/internal/update/layout.go +++ b/internal/platform/update/layout.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/installlayout" + "reasonix/internal/platform/installlayout" ) // Layout is where this build lives on disk. The three are resolved together diff --git a/internal/update/line.go b/internal/platform/update/line.go similarity index 100% rename from internal/update/line.go rename to internal/platform/update/line.go diff --git a/internal/update/manifest.go b/internal/platform/update/manifest.go similarity index 100% rename from internal/update/manifest.go rename to internal/platform/update/manifest.go diff --git a/internal/update/pin.go b/internal/platform/update/pin.go similarity index 100% rename from internal/update/pin.go rename to internal/platform/update/pin.go diff --git a/internal/update/pin_test.go b/internal/platform/update/pin_test.go similarity index 100% rename from internal/update/pin_test.go rename to internal/platform/update/pin_test.go diff --git a/internal/update/progress.go b/internal/platform/update/progress.go similarity index 100% rename from internal/update/progress.go rename to internal/platform/update/progress.go diff --git a/internal/update/redirect_test.go b/internal/platform/update/redirect_test.go similarity index 95% rename from internal/update/redirect_test.go rename to internal/platform/update/redirect_test.go index b203d228d8..5568889e6c 100644 --- a/internal/update/redirect_test.go +++ b/internal/platform/update/redirect_test.go @@ -5,10 +5,10 @@ import ( "net/http" "testing" - "reasonix/internal/redirectguard" + "reasonix/internal/safety/redirectguard" ) -// The mechanism is held by internal/redirectguard. What this holds is the +// The mechanism is held by internal/safety/redirectguard. What this holds is the // decision made here: Studio's own CDN is trusted, and a name that merely ends // in ours is not. func TestUpdateTrustsItsOwnReleaseHosts(t *testing.T) { diff --git a/internal/update/release_unit.go b/internal/platform/update/release_unit.go similarity index 100% rename from internal/update/release_unit.go rename to internal/platform/update/release_unit.go diff --git a/internal/update/release_unit_test.go b/internal/platform/update/release_unit_test.go similarity index 100% rename from internal/update/release_unit_test.go rename to internal/platform/update/release_unit_test.go diff --git a/internal/update/studio_line.go b/internal/platform/update/studio_line.go similarity index 100% rename from internal/update/studio_line.go rename to internal/platform/update/studio_line.go diff --git a/internal/update/transport.go b/internal/platform/update/transport.go similarity index 100% rename from internal/update/transport.go rename to internal/platform/update/transport.go diff --git a/internal/update/transport_test.go b/internal/platform/update/transport_test.go similarity index 100% rename from internal/update/transport_test.go rename to internal/platform/update/transport_test.go diff --git a/internal/update/update_test.go b/internal/platform/update/update_test.go similarity index 100% rename from internal/update/update_test.go rename to internal/platform/update/update_test.go diff --git a/internal/update/updater.go b/internal/platform/update/updater.go similarity index 99% rename from internal/update/updater.go rename to internal/platform/update/updater.go index 61e0e8edf0..6bf4ed6fbc 100644 --- a/internal/update/updater.go +++ b/internal/platform/update/updater.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "reasonix/internal/redirectguard" + "reasonix/internal/safety/redirectguard" ) // ProgressFunc reports bytes received against the total, for a progress bar. diff --git a/internal/update/updater_test.go b/internal/platform/update/updater_test.go similarity index 100% rename from internal/update/updater_test.go rename to internal/platform/update/updater_test.go diff --git a/internal/update/verify.go b/internal/platform/update/verify.go similarity index 100% rename from internal/update/verify.go rename to internal/platform/update/verify.go diff --git a/internal/update/windows_payload.go b/internal/platform/update/windows_payload.go similarity index 100% rename from internal/update/windows_payload.go rename to internal/platform/update/windows_payload.go diff --git a/internal/update/windows_payload_test.go b/internal/platform/update/windows_payload_test.go similarity index 100% rename from internal/update/windows_payload_test.go rename to internal/platform/update/windows_payload_test.go diff --git a/internal/worktree/worktree.go b/internal/platform/worktree/worktree.go similarity index 99% rename from internal/worktree/worktree.go rename to internal/platform/worktree/worktree.go index 230e14b750..c77963b7da 100644 --- a/internal/worktree/worktree.go +++ b/internal/platform/worktree/worktree.go @@ -16,7 +16,7 @@ import ( "strings" "time" - "reasonix/internal/gitcmd" + "reasonix/internal/platform/gitcmd" ) const ( diff --git a/internal/worktree/worktree_test.go b/internal/platform/worktree/worktree_test.go similarity index 98% rename from internal/worktree/worktree_test.go rename to internal/platform/worktree/worktree_test.go index d3c78aa806..aa2fd92745 100644 --- a/internal/worktree/worktree_test.go +++ b/internal/platform/worktree/worktree_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func requireGit(t *testing.T) { @@ -246,7 +246,7 @@ func TestSafePathComponentHandlesWindowsNames(t *testing.T) { } // Argument construction — including the Windows-only core.longpaths override — -// now lives in internal/gitcmd and is covered by that package's tests. +// now lives in internal/platform/gitcmd and is covered by that package's tests. func TestGitWorktreeAddUsesExtendedTimeout(t *testing.T) { if got := gitTimeout([]string{"status", "--porcelain=v1"}); got != gitProbeTimeout { diff --git a/internal/worktree/worktree_windows_test.go b/internal/platform/worktree/worktree_windows_test.go similarity index 98% rename from internal/worktree/worktree_windows_test.go rename to internal/platform/worktree/worktree_windows_test.go index 1e3bca41c9..c7d8b2eea0 100644 --- a/internal/worktree/worktree_windows_test.go +++ b/internal/platform/worktree/worktree_windows_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestCreateChecksOutLongRepositoryPathOnWindows(t *testing.T) { diff --git a/internal/agent/ablation_test.go b/internal/runtime/agent/ablation_test.go similarity index 95% rename from internal/agent/ablation_test.go rename to internal/runtime/agent/ablation_test.go index 02de751ab6..ab4e5c17d0 100644 --- a/internal/agent/ablation_test.go +++ b/internal/runtime/agent/ablation_test.go @@ -3,8 +3,8 @@ package agent import ( "testing" - "reasonix/internal/ablation" - "reasonix/internal/evidence" + "reasonix/internal/contract/ablation" + "reasonix/internal/runtime/evidence" ) func TestEvidenceAblationStandsDownTheReadinessGate(t *testing.T) { diff --git a/internal/agent/agent.go b/internal/runtime/agent/agent.go similarity index 99% rename from internal/agent/agent.go rename to internal/runtime/agent/agent.go index 0b79de9513..6574fb868e 100644 --- a/internal/agent/agent.go +++ b/internal/runtime/agent/agent.go @@ -10,24 +10,24 @@ import ( "time" "unicode/utf8" - "reasonix/internal/ablation" - "reasonix/internal/agentpreset" - "reasonix/internal/capability" - "reasonix/internal/checkpoint" - "reasonix/internal/diff" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/extension/dispatch" - "reasonix/internal/instruction" - "reasonix/internal/jobs" - "reasonix/internal/memory" - "reasonix/internal/nilutil" - "reasonix/internal/plancontract" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/taskpolicy" - "reasonix/internal/tool" + "reasonix/internal/base/diff" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/agentpreset" + "reasonix/internal/contract/event" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" + "reasonix/internal/runtime/taskpolicy" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/checkpoint" + "reasonix/internal/state/instruction" + "reasonix/internal/state/memory" ) // maxToolOutputBytes caps a single tool result before it goes into the model's @@ -99,7 +99,7 @@ type callContext struct { // the asker. executeOne sets this before every Execute; `task` reads it (via // CallContext) to nest sub-agent events, and `ask` reads the asker to prompt. // The plan-mode flag is mirrored onto the leaf planmode key so tools that must -// not import this package (for example internal/tool/builtin) can still read it. +// not import this package (for example internal/tools/builtin) can still read it. func withCallContext(ctx context.Context, parentID string, sink event.Sink, asker Asker, planMode bool) context.Context { ctx = planmode.WithActive(ctx, planMode) return context.WithValue(ctx, callContextKey{}, callContext{parentID: parentID, sink: sink, asker: asker, planMode: planMode}) diff --git a/internal/agent/agent_config.go b/internal/runtime/agent/agent_config.go similarity index 100% rename from internal/agent/agent_config.go rename to internal/runtime/agent/agent_config.go diff --git a/internal/agent/agent_config_test.go b/internal/runtime/agent/agent_config_test.go similarity index 100% rename from internal/agent/agent_config_test.go rename to internal/runtime/agent/agent_config_test.go diff --git a/internal/agent/agent_options.go b/internal/runtime/agent/agent_options.go similarity index 95% rename from internal/agent/agent_options.go rename to internal/runtime/agent/agent_options.go index 3a534a5c95..24ce3ef433 100644 --- a/internal/agent/agent_options.go +++ b/internal/runtime/agent/agent_options.go @@ -2,18 +2,18 @@ package agent import ( - "reasonix/internal/ablation" - "reasonix/internal/capability" - "reasonix/internal/checkpoint" - "reasonix/internal/evidence" - "reasonix/internal/extension/dispatch" - "reasonix/internal/instruction" - "reasonix/internal/jobs" - "reasonix/internal/memory" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/tool" - "reasonix/internal/workspacelease" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/checkpoint" + "reasonix/internal/state/instruction" + "reasonix/internal/state/memory" + "reasonix/internal/state/workspacelease" ) // Options configures an Agent. diff --git a/internal/agent/agent_role.go b/internal/runtime/agent/agent_role.go similarity index 100% rename from internal/agent/agent_role.go rename to internal/runtime/agent/agent_role.go diff --git a/internal/agent/argserror_test.go b/internal/runtime/agent/argserror_test.go similarity index 94% rename from internal/agent/argserror_test.go rename to internal/runtime/agent/argserror_test.go index 744ee29164..cb6102f4eb 100644 --- a/internal/agent/argserror_test.go +++ b/internal/runtime/agent/argserror_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A model that emits structurally-invalid JSON for a tool's args should get the diff --git a/internal/agent/ask.go b/internal/runtime/agent/ask.go similarity index 99% rename from internal/agent/ask.go rename to internal/runtime/agent/ask.go index 5b29ddb23b..551564309f 100644 --- a/internal/agent/ask.go +++ b/internal/runtime/agent/ask.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // AskTool obtains what only the user can supply: a decision that is theirs, or a diff --git a/internal/agent/ask_delegated_test.go b/internal/runtime/agent/ask_delegated_test.go similarity index 95% rename from internal/agent/ask_delegated_test.go rename to internal/runtime/agent/ask_delegated_test.go index da72823485..dd5749daeb 100644 --- a/internal/agent/ask_delegated_test.go +++ b/internal/runtime/agent/ask_delegated_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A delegated run is the parent blocked on one child, so exactly one question diff --git a/internal/agent/ask_test.go b/internal/runtime/agent/ask_test.go similarity index 98% rename from internal/agent/ask_test.go rename to internal/runtime/agent/ask_test.go index 00ac3d1ee4..a5fb6328ad 100644 --- a/internal/agent/ask_test.go +++ b/internal/runtime/agent/ask_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type recordingAsker struct { diff --git a/internal/agent/authored_turn.go b/internal/runtime/agent/authored_turn.go similarity index 98% rename from internal/agent/authored_turn.go rename to internal/runtime/agent/authored_turn.go index e6337ec5ca..d1214c99c8 100644 --- a/internal/agent/authored_turn.go +++ b/internal/runtime/agent/authored_turn.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // TurnClassification names the authored turn a message belongs to. StartsTurn diff --git a/internal/agent/authored_turn_test.go b/internal/runtime/agent/authored_turn_test.go similarity index 98% rename from internal/agent/authored_turn_test.go rename to internal/runtime/agent/authored_turn_test.go index 94ce3e9bc5..f00ad76a12 100644 --- a/internal/agent/authored_turn_test.go +++ b/internal/runtime/agent/authored_turn_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type turnStartProvider struct{} diff --git a/internal/agent/await_user.go b/internal/runtime/agent/await_user.go similarity index 99% rename from internal/agent/await_user.go rename to internal/runtime/agent/await_user.go index 576c6e2b61..32cd51fb78 100644 --- a/internal/agent/await_user.go +++ b/internal/runtime/agent/await_user.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // AwaitUserTool declares that an open task list cannot advance without the diff --git a/internal/agent/await_user_test.go b/internal/runtime/agent/await_user_test.go similarity index 99% rename from internal/agent/await_user_test.go rename to internal/runtime/agent/await_user_test.go index ad1688ac8c..2c2904a14b 100644 --- a/internal/agent/await_user_test.go +++ b/internal/runtime/agent/await_user_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) func awaitCtx(todos []evidence.TodoItem, interactive bool) context.Context { diff --git a/internal/agent/baseline_criteria.go b/internal/runtime/agent/baseline_criteria.go similarity index 98% rename from internal/agent/baseline_criteria.go rename to internal/runtime/agent/baseline_criteria.go index 6f8732b0ea..c635d9b6c2 100644 --- a/internal/agent/baseline_criteria.go +++ b/internal/runtime/agent/baseline_criteria.go @@ -12,9 +12,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/diff" - "reasonix/internal/evidence" - "reasonix/internal/fileutil" + "reasonix/internal/base/diff" + "reasonix/internal/base/fileutil" + "reasonix/internal/runtime/evidence" ) // captureRewrittenCriteria files what a criterion said before this edit. It runs diff --git a/internal/agent/baseline_criteria_test.go b/internal/runtime/agent/baseline_criteria_test.go similarity index 99% rename from internal/agent/baseline_criteria_test.go rename to internal/runtime/agent/baseline_criteria_test.go index da2bc2fd2d..b133712fe7 100644 --- a/internal/agent/baseline_criteria_test.go +++ b/internal/runtime/agent/baseline_criteria_test.go @@ -8,9 +8,9 @@ import ( "sync/atomic" "testing" - "reasonix/internal/diff" - "reasonix/internal/evidence" - "reasonix/internal/testenv" + "reasonix/internal/base/diff" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/evidence" ) const ( diff --git a/internal/agent/baseline_evaluate.go b/internal/runtime/agent/baseline_evaluate.go similarity index 98% rename from internal/agent/baseline_evaluate.go rename to internal/runtime/agent/baseline_evaluate.go index 149ff6662a..87a1a275b8 100644 --- a/internal/agent/baseline_evaluate.go +++ b/internal/runtime/agent/baseline_evaluate.go @@ -11,8 +11,8 @@ import ( "os/exec" "path/filepath" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) // baselineBackend names the capability that produced a result, so a claim never diff --git a/internal/agent/baseline_evaluate_test.go b/internal/runtime/agent/baseline_evaluate_test.go similarity index 98% rename from internal/agent/baseline_evaluate_test.go rename to internal/runtime/agent/baseline_evaluate_test.go index 08a140ef94..b0a03e00e3 100644 --- a/internal/agent/baseline_evaluate_test.go +++ b/internal/runtime/agent/baseline_evaluate_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "reasonix/internal/evidence" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/evidence" ) // A real module, a real toolchain run: the criterion the task began under is diff --git a/internal/agent/batch_meta_skip_test.go b/internal/runtime/agent/batch_meta_skip_test.go similarity index 88% rename from internal/agent/batch_meta_skip_test.go rename to internal/runtime/agent/batch_meta_skip_test.go index 2c5859059c..7fbce305a2 100644 --- a/internal/agent/batch_meta_skip_test.go +++ b/internal/runtime/agent/batch_meta_skip_test.go @@ -3,9 +3,9 @@ package agent import ( "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // Delegation spawns work rather than changing state, so a failed one does not diff --git a/internal/agent/blocked_outcome.go b/internal/runtime/agent/blocked_outcome.go similarity index 96% rename from internal/agent/blocked_outcome.go rename to internal/runtime/agent/blocked_outcome.go index 0f13e4094c..a3cc4070b7 100644 --- a/internal/agent/blocked_outcome.go +++ b/internal/runtime/agent/blocked_outcome.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/tool" +import "reasonix/internal/contract/tool" // blockedToolOutcome shapes a tool's own refusal into the standard blocked // outcome, with the not-run shell metadata a blocked bash card renders. diff --git a/internal/agent/blocked_tool_e2e_test.go b/internal/runtime/agent/blocked_tool_e2e_test.go similarity index 91% rename from internal/agent/blocked_tool_e2e_test.go rename to internal/runtime/agent/blocked_tool_e2e_test.go index c9e889d3e1..40b432d6f1 100644 --- a/internal/agent/blocked_tool_e2e_test.go +++ b/internal/runtime/agent/blocked_tool_e2e_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" ) // A read-only subagent refusing its own bash call must reach the frontend as a diff --git a/internal/agent/branch.go b/internal/runtime/agent/branch.go similarity index 99% rename from internal/agent/branch.go rename to internal/runtime/agent/branch.go index 833f04084e..f8a4fcaef0 100644 --- a/internal/agent/branch.go +++ b/internal/runtime/agent/branch.go @@ -10,9 +10,9 @@ import ( "sync/atomic" "time" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/state/store" ) // BranchMeta is the small sidecar record that turns flat session files into a diff --git a/internal/agent/branch_sanitize_test.go b/internal/runtime/agent/branch_sanitize_test.go similarity index 97% rename from internal/agent/branch_sanitize_test.go rename to internal/runtime/agent/branch_sanitize_test.go index 746a97b00f..837078f702 100644 --- a/internal/agent/branch_sanitize_test.go +++ b/internal/runtime/agent/branch_sanitize_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // Older builds persisted display fields polluted with internal wrappers. diff --git a/internal/agent/branch_test.go b/internal/runtime/agent/branch_test.go similarity index 99% rename from internal/agent/branch_test.go rename to internal/runtime/agent/branch_test.go index 42fd8b2b07..a17d2674fa 100644 --- a/internal/agent/branch_test.go +++ b/internal/runtime/agent/branch_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) // touchBranchMeta bumps only the activity timestamp, the one field these diff --git a/internal/agent/cache_body_test.go b/internal/runtime/agent/cache_body_test.go similarity index 99% rename from internal/agent/cache_body_test.go rename to internal/runtime/agent/cache_body_test.go index 0b4266e35f..9f2e4b3e64 100644 --- a/internal/agent/cache_body_test.go +++ b/internal/runtime/agent/cache_body_test.go @@ -4,7 +4,7 @@ import ( "slices" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func msgs(texts ...string) []provider.Message { diff --git a/internal/agent/cache_diagnostics_test.go b/internal/runtime/agent/cache_diagnostics_test.go similarity index 97% rename from internal/agent/cache_diagnostics_test.go rename to internal/runtime/agent/cache_diagnostics_test.go index a36dc14c9c..4c03b07000 100644 --- a/internal/agent/cache_diagnostics_test.go +++ b/internal/runtime/agent/cache_diagnostics_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type cacheDiagProvider struct { diff --git a/internal/agent/cache_shape.go b/internal/runtime/agent/cache_shape.go similarity index 97% rename from internal/agent/cache_shape.go rename to internal/runtime/agent/cache_shape.go index cf6325d079..47e06917ac 100644 --- a/internal/agent/cache_shape.go +++ b/internal/runtime/agent/cache_shape.go @@ -6,9 +6,9 @@ import ( "fmt" "sort" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tokencount" + "reasonix/internal/base/tokencount" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // PrefixShape hashes the portions of the request prefix that influence diff --git a/internal/agent/cache_shape_test.go b/internal/runtime/agent/cache_shape_test.go similarity index 98% rename from internal/agent/cache_shape_test.go rename to internal/runtime/agent/cache_shape_test.go index 442451493c..211801f282 100644 --- a/internal/agent/cache_shape_test.go +++ b/internal/runtime/agent/cache_shape_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestCaptureShapeNormalizesToolSchemaOrder(t *testing.T) { diff --git a/internal/agent/cachehit_e2e_test.go b/internal/runtime/agent/cachehit_e2e_test.go similarity index 99% rename from internal/agent/cachehit_e2e_test.go rename to internal/runtime/agent/cachehit_e2e_test.go index e51a7e6775..38605a3991 100644 --- a/internal/agent/cachehit_e2e_test.go +++ b/internal/runtime/agent/cachehit_e2e_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/model/openai" ) // echoTool is a trivial read-only tool used to drive a multi-step tool loop: diff --git a/internal/agent/call_contract.go b/internal/runtime/agent/call_contract.go similarity index 100% rename from internal/agent/call_contract.go rename to internal/runtime/agent/call_contract.go diff --git a/internal/agent/call_contract_test.go b/internal/runtime/agent/call_contract_test.go similarity index 98% rename from internal/agent/call_contract_test.go rename to internal/runtime/agent/call_contract_test.go index 0c759cdda1..ee7fbc820a 100644 --- a/internal/agent/call_contract_test.go +++ b/internal/runtime/agent/call_contract_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/capability" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/capability" ) // contractTool declares required fields and records whether it ever ran. diff --git a/internal/agent/cancel_test.go b/internal/runtime/agent/cancel_test.go similarity index 99% rename from internal/agent/cancel_test.go rename to internal/runtime/agent/cancel_test.go index f7fb91e3fe..f74331794b 100644 --- a/internal/agent/cancel_test.go +++ b/internal/runtime/agent/cancel_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" ) // slowTool is a tool that takes a noticeable amount of time to execute, diff --git a/internal/agent/canonical_path_test.go b/internal/runtime/agent/canonical_path_test.go similarity index 98% rename from internal/agent/canonical_path_test.go rename to internal/runtime/agent/canonical_path_test.go index 0a6c29e8a8..9653ef4764 100644 --- a/internal/agent/canonical_path_test.go +++ b/internal/runtime/agent/canonical_path_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestCanonicalSessionPathMatchesLeaseRegistryKey(t *testing.T) { diff --git a/internal/agent/canonical_todo_test.go b/internal/runtime/agent/canonical_todo_test.go similarity index 99% rename from internal/agent/canonical_todo_test.go rename to internal/runtime/agent/canonical_todo_test.go index 77b6867a3a..7b2f0ed2fc 100644 --- a/internal/agent/canonical_todo_test.go +++ b/internal/runtime/agent/canonical_todo_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) func TestFinalReadinessFallsBackToCanonicalTodos(t *testing.T) { diff --git a/internal/agent/capability_alias_test.go b/internal/runtime/agent/capability_alias_test.go similarity index 98% rename from internal/agent/capability_alias_test.go rename to internal/runtime/agent/capability_alias_test.go index 5bb03a151c..4d898d6279 100644 --- a/internal/agent/capability_alias_test.go +++ b/internal/runtime/agent/capability_alias_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/capability" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/capability" ) // delegationTools are the dispatchers hidden from the provider schema. A model diff --git a/internal/agent/capability_arguments_test.go b/internal/runtime/agent/capability_arguments_test.go similarity index 97% rename from internal/agent/capability_arguments_test.go rename to internal/runtime/agent/capability_arguments_test.go index 231ceb772a..271f401b5d 100644 --- a/internal/agent/capability_arguments_test.go +++ b/internal/runtime/agent/capability_arguments_test.go @@ -6,8 +6,8 @@ import ( "slices" "testing" - "reasonix/internal/capability" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/capability" ) type namedSchemaTool struct { diff --git a/internal/agent/capability_discovery_test.go b/internal/runtime/agent/capability_discovery_test.go similarity index 100% rename from internal/agent/capability_discovery_test.go rename to internal/runtime/agent/capability_discovery_test.go diff --git a/internal/agent/capability_gate.go b/internal/runtime/agent/capability_gate.go similarity index 98% rename from internal/agent/capability_gate.go rename to internal/runtime/agent/capability_gate.go index b6bbd83d58..243152d3e8 100644 --- a/internal/agent/capability_gate.go +++ b/internal/runtime/agent/capability_gate.go @@ -6,11 +6,11 @@ import ( "path/filepath" "strings" - "reasonix/internal/capability" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/evidence" ) // capabilityGateState is one user turn's gate memory, scoped to the same turn diff --git a/internal/agent/capability_gate_test.go b/internal/runtime/agent/capability_gate_test.go similarity index 85% rename from internal/agent/capability_gate_test.go rename to internal/runtime/agent/capability_gate_test.go index 59f0b6ac67..52daf9bf83 100644 --- a/internal/agent/capability_gate_test.go +++ b/internal/runtime/agent/capability_gate_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "reasonix/internal/agentpreset" - "reasonix/internal/evidence" - "reasonix/internal/taskpolicy" - "reasonix/internal/tool" + "reasonix/internal/contract/agentpreset" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/taskpolicy" ) // Every production turn freezes a TaskPolicy before the first request, so the @@ -16,14 +16,14 @@ import ( // other cases in this file construct. func TestDeliveryReviewGateHoldsUnderFrozenTaskPolicy(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/permission/gate.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/safety/permission/gate.go"}`), true, evidence.ToolFacts{})) reg := tool.NewRegistry() reg.Add(fakeTool{name: "review", readOnly: true}) reg.Add(fakeTool{name: "security_review", readOnly: true}) a := &Agent{deliveryProfile: true, task: taskRuntime{ledger: ledger}, svc: agentServices{tools: reg}} - a.projectSensitivePaths = []string{"internal/permission/**"} + a.projectSensitivePaths = []string{"internal/safety/permission/**"} a.turn.policy = taskpolicy.Derive(taskpolicy.Input{Preset: agentpreset.Delivery}) a.turn.policySet = true @@ -67,7 +67,7 @@ func TestDeliveryReviewGateExplainsOpaqueMutationRecovery(t *testing.T) { ledger.Record(grantedReviewReceipt(evidence.ReviewKindReview, `{ "kind":"review", "verdict":"pass", - "reviewed_paths":["internal/agent/agent.go"], + "reviewed_paths":["internal/runtime/agent/agent.go"], "findings":[] }`)) got = a.reviewGateFailure() @@ -78,7 +78,7 @@ func TestDeliveryReviewGateExplainsOpaqueMutationRecovery(t *testing.T) { ledger.Record(grantedReviewReceipt(evidence.ReviewKindSecurity, `{ "kind":"security", "verdict":"pass", - "reviewed_paths":["internal/agent/agent.go"], + "reviewed_paths":["internal/runtime/agent/agent.go"], "findings":[] }`)) if got := a.reviewGateFailure(); got != "" { @@ -88,7 +88,7 @@ func TestDeliveryReviewGateExplainsOpaqueMutationRecovery(t *testing.T) { func TestNonDeliveryProfileNeverRequiresStructuredReview(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/permission/gate.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/safety/permission/gate.go"}`), true, evidence.ToolFacts{})) reg := tool.NewRegistry() reg.Add(fakeTool{name: "review", readOnly: true}) @@ -102,13 +102,13 @@ func TestNonDeliveryProfileNeverRequiresStructuredReview(t *testing.T) { func TestDeliveryReviewGateHighRiskStillRequiresSecurityReview(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/permission/gate.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/safety/permission/gate.go"}`), true, evidence.ToolFacts{})) reg := tool.NewRegistry() reg.Add(fakeTool{name: "review", readOnly: true}) reg.Add(fakeTool{name: "security_review", readOnly: true}) a := &Agent{deliveryProfile: true, task: taskRuntime{ledger: ledger}, svc: agentServices{tools: reg}} - a.projectSensitivePaths = []string{"internal/permission/**"} + a.projectSensitivePaths = []string{"internal/safety/permission/**"} if got := a.reviewGateFailure(); !strings.Contains(got, "high-risk") { t.Fatalf("review gate = %q, want high-risk review demand", got) @@ -117,7 +117,7 @@ func TestDeliveryReviewGateHighRiskStillRequiresSecurityReview(t *testing.T) { ledger.Record(grantedReviewReceipt(evidence.ReviewKindReview, `{ "kind":"review", "verdict":"pass", - "reviewed_paths":["internal/permission/gate.go"], + "reviewed_paths":["internal/safety/permission/gate.go"], "findings":[] }`)) if got := a.reviewGateFailure(); !strings.Contains(got, "security_review") { @@ -127,7 +127,7 @@ func TestDeliveryReviewGateHighRiskStillRequiresSecurityReview(t *testing.T) { ledger.Record(grantedReviewReceipt(evidence.ReviewKindSecurity, `{ "kind":"security", "verdict":"pass", - "reviewed_paths":["internal/permission/gate.go"], + "reviewed_paths":["internal/safety/permission/gate.go"], "findings":[] }`)) if got := a.reviewGateFailure(); got != "" { @@ -140,7 +140,7 @@ func TestDeliveryReviewGateHighRiskStillRequiresSecurityReview(t *testing.T) { // taken and the demand never bound. func TestReviewGateBuysNoReviewerForOrdinaryProductionCode(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/agent/parser.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/runtime/agent/parser.go"}`), true, evidence.ToolFacts{})) reg := tool.NewRegistry() reg.Add(fakeTool{name: "review", readOnly: true}) @@ -152,7 +152,7 @@ func TestReviewGateBuysNoReviewerForOrdinaryProductionCode(t *testing.T) { } // The same edit under a path the project declared sensitive still buys both. - a.projectSensitivePaths = []string{"internal/agent/**"} + a.projectSensitivePaths = []string{"internal/runtime/agent/**"} if got := a.reviewGateFailure(); !strings.Contains(got, "high-risk") { t.Fatalf("declared-sensitive gate = %q, want the high-risk demand", got) } @@ -163,11 +163,11 @@ func TestReviewGateBuysNoReviewerForOrdinaryProductionCode(t *testing.T) { // nobody demanded a review for was gathered nowhere. func TestWarningsAreReadFromAnyReviewTheTurnRan(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/agent/parser.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/runtime/agent/parser.go"}`), true, evidence.ToolFacts{})) ledger.Record(evidence.Receipt{ToolName: "review_report", Success: true, Args: json.RawMessage(`{ "kind":"review", "verdict":"warn", - "reviewed_paths":["internal/agent/parser.go"], + "reviewed_paths":["internal/runtime/agent/parser.go"], "findings":[{"severity":"warn","summary":"error path has no test"}] }`)}) @@ -185,7 +185,7 @@ func TestWarningsAreReadFromAnyReviewTheTurnRan(t *testing.T) { func TestDeliveryReviewGateDefersToParentInSubagents(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/permission/gate.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/safety/permission/gate.go"}`), true, evidence.ToolFacts{})) reg := tool.NewRegistry() reg.Add(fakeTool{name: "review", readOnly: true}) @@ -206,13 +206,13 @@ func TestDeliveryReviewGateDefersToParentInSubagents(t *testing.T) { // change out of scope and the whole structured-review demand with it. func TestReviewGateKeepsSensitiveChangeInScopeAfterHarmlessWrite(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/permission/gate.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/safety/permission/gate.go"}`), true, evidence.ToolFacts{})) reg := tool.NewRegistry() reg.Add(fakeTool{name: "review", readOnly: true}) reg.Add(fakeTool{name: "security_review", readOnly: true}) a := &Agent{deliveryProfile: true, task: taskRuntime{ledger: ledger}, svc: agentServices{tools: reg}} - a.projectSensitivePaths = []string{"internal/permission/**"} + a.projectSensitivePaths = []string{"internal/safety/permission/**"} if got := a.reviewGateFailure(); !strings.Contains(got, "high-risk") { t.Fatalf("review gate = %q, want high-risk demand", got) @@ -223,7 +223,7 @@ func TestReviewGateKeepsSensitiveChangeInScopeAfterHarmlessWrite(t *testing.T) { if !strings.Contains(got, "high-risk") { t.Fatalf("gate after a doc write = %q, want the sensitive change still in scope", got) } - if !strings.Contains(got, "internal/permission/gate.go") { + if !strings.Contains(got, "internal/safety/permission/gate.go") { t.Fatalf("coverage hint = %q, want the sensitive path named", got) } } @@ -234,12 +234,12 @@ func TestBlockingReviewStopsDeliveryAtEveryRoleSetting(t *testing.T) { block := json.RawMessage(`{ "kind":"review", "verdict":"block", - "reviewed_paths":["internal/agent/agent.go"], + "reviewed_paths":["internal/runtime/agent/agent.go"], "findings":[{"severity":"block","summary":"nil deref on the error path"}] }`) for _, delivery := range []bool{false, true} { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, evidence.ToolFacts{})) ledger.Record(evidence.Receipt{ToolName: "review_report", Success: true, Args: block}) reg := tool.NewRegistry() @@ -256,11 +256,11 @@ func TestBlockingReviewStopsDeliveryAtEveryRoleSetting(t *testing.T) { // that is what moves the freshness window past the refusal. func TestBlockingReviewClearsOnlyAfterTheFixMutation(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, evidence.ToolFacts{})) ledger.Record(evidence.Receipt{ToolName: "review_report", Success: true, Args: json.RawMessage(`{ "kind":"review", "verdict":"block", - "reviewed_paths":["internal/agent/agent.go"], + "reviewed_paths":["internal/runtime/agent/agent.go"], "findings":[{"severity":"block","summary":"nil deref on the error path"}] }`)}) @@ -272,14 +272,14 @@ func TestBlockingReviewClearsOnlyAfterTheFixMutation(t *testing.T) { ledger.Record(evidence.Receipt{ToolName: "review_report", Success: true, Args: json.RawMessage(`{ "kind":"review", "verdict":"pass", - "reviewed_paths":["internal/agent/agent.go"], + "reviewed_paths":["internal/runtime/agent/agent.go"], "findings":[] }`)}) if got := a.reviewGateFailure(); !strings.Contains(got, "blocking findings") { t.Fatalf("gate after a pass with no fix = %q, want the block to hold", got) } - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, evidence.ToolFacts{})) if got := a.reviewGateFailure(); got != "" { t.Fatalf("gate after the fix = %q, want the refusal retired", got) } @@ -290,12 +290,12 @@ func TestBlockingReviewClearsOnlyAfterTheFixMutation(t *testing.T) { // from a pass; the turn that ships on one has to say so. func TestWarnVerdictReachesTheUserWhenTheTurnShips(t *testing.T) { ledger := evidence.NewLedger() - ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, evidence.ToolFacts{})) + ledger.Record(evidence.ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, evidence.ToolFacts{})) ledger.Record(evidence.Receipt{ToolName: "review_report", Success: true, Args: json.RawMessage(`{ "kind":"review", "verdict":"warn", - "reviewed_paths":["internal/agent/agent.go"], - "findings":[{"severity":"warn","summary":"error path has no test","path":"internal/agent/agent.go"}] + "reviewed_paths":["internal/runtime/agent/agent.go"], + "findings":[{"severity":"warn","summary":"error path has no test","path":"internal/runtime/agent/agent.go"}] }`)}) reg := tool.NewRegistry() diff --git a/internal/agent/capability_lead.go b/internal/runtime/agent/capability_lead.go similarity index 96% rename from internal/agent/capability_lead.go rename to internal/runtime/agent/capability_lead.go index 97fdf36b8e..3ae066cd90 100644 --- a/internal/agent/capability_lead.go +++ b/internal/runtime/agent/capability_lead.go @@ -3,7 +3,7 @@ package agent import ( "strings" - fileenc "reasonix/internal/fileutil/encoding" + fileenc "reasonix/internal/base/fileutil/encoding" ) // capabilityLeadBytes bounds one catalog row's description. Full descriptions diff --git a/internal/agent/capability_lead_test.go b/internal/runtime/agent/capability_lead_test.go similarity index 100% rename from internal/agent/capability_lead_test.go rename to internal/runtime/agent/capability_lead_test.go diff --git a/internal/agent/capability_listing.go b/internal/runtime/agent/capability_listing.go similarity index 98% rename from internal/agent/capability_listing.go rename to internal/runtime/agent/capability_listing.go index 4ce5a8ed9e..425b5b90c8 100644 --- a/internal/agent/capability_listing.go +++ b/internal/runtime/agent/capability_listing.go @@ -7,8 +7,8 @@ import ( "slices" "strings" - "reasonix/internal/capability" - "reasonix/internal/plugin" + "reasonix/internal/ext/plugin" + "reasonix/internal/runtime/capability" ) // listServerInfo is one configured MCP server entry returned by action=list. diff --git a/internal/agent/checkpoint_rejected.go b/internal/runtime/agent/checkpoint_rejected.go similarity index 100% rename from internal/agent/checkpoint_rejected.go rename to internal/runtime/agent/checkpoint_rejected.go diff --git a/internal/agent/checkpoint_rejected_test.go b/internal/runtime/agent/checkpoint_rejected_test.go similarity index 100% rename from internal/agent/checkpoint_rejected_test.go rename to internal/runtime/agent/checkpoint_rejected_test.go diff --git a/internal/agent/child_sink_capabilities_test.go b/internal/runtime/agent/child_sink_capabilities_test.go similarity index 96% rename from internal/agent/child_sink_capabilities_test.go rename to internal/runtime/agent/child_sink_capabilities_test.go index 43da732cbe..26e728b035 100644 --- a/internal/agent/child_sink_capabilities_test.go +++ b/internal/runtime/agent/child_sink_capabilities_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // Every sink this package hands to a child agent has to forward audits: a diff --git a/internal/agent/command_class.go b/internal/runtime/agent/command_class.go similarity index 98% rename from internal/agent/command_class.go rename to internal/runtime/agent/command_class.go index c18ab2c93c..15389df529 100644 --- a/internal/agent/command_class.go +++ b/internal/runtime/agent/command_class.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) // The static tables will never know every tool, and each one that falls through diff --git a/internal/agent/command_class_test.go b/internal/runtime/agent/command_class_test.go similarity index 100% rename from internal/agent/command_class_test.go rename to internal/runtime/agent/command_class_test.go diff --git a/internal/agent/commit_covered_test.go b/internal/runtime/agent/commit_covered_test.go similarity index 97% rename from internal/agent/commit_covered_test.go rename to internal/runtime/agent/commit_covered_test.go index 084cb2c801..376edaf006 100644 --- a/internal/agent/commit_covered_test.go +++ b/internal/runtime/agent/commit_covered_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func commitTestAgent(t *testing.T) *Agent { diff --git a/internal/agent/compact.go b/internal/runtime/agent/compact.go similarity index 99% rename from internal/agent/compact.go rename to internal/runtime/agent/compact.go index 146a31ed9e..5d575d78d9 100644 --- a/internal/agent/compact.go +++ b/internal/runtime/agent/compact.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "reasonix/internal/ablation" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // Compaction is a low-frequency cache-reset point: the prompt grows append-only diff --git a/internal/agent/compact_ablation_test.go b/internal/runtime/agent/compact_ablation_test.go similarity index 96% rename from internal/agent/compact_ablation_test.go rename to internal/runtime/agent/compact_ablation_test.go index 3b9f032029..65acec8b61 100644 --- a/internal/agent/compact_ablation_test.go +++ b/internal/runtime/agent/compact_ablation_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" - "reasonix/internal/ablation" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func armedAgent(t *testing.T, sess *Session, arm ablation.Set) *Agent { diff --git a/internal/agent/compact_accounting.go b/internal/runtime/agent/compact_accounting.go similarity index 98% rename from internal/agent/compact_accounting.go rename to internal/runtime/agent/compact_accounting.go index 250e83e59d..a3e5b004d8 100644 --- a/internal/agent/compact_accounting.go +++ b/internal/runtime/agent/compact_accounting.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // CompactionUsage is what one maintenance transaction spent with the provider: diff --git a/internal/agent/compact_accounting_test.go b/internal/runtime/agent/compact_accounting_test.go similarity index 98% rename from internal/agent/compact_accounting_test.go rename to internal/runtime/agent/compact_accounting_test.go index 2bc1b4a168..068047676f 100644 --- a/internal/agent/compact_accounting_test.go +++ b/internal/runtime/agent/compact_accounting_test.go @@ -9,10 +9,10 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type scriptedReply struct { diff --git a/internal/agent/compact_announce_test.go b/internal/runtime/agent/compact_announce_test.go similarity index 92% rename from internal/agent/compact_announce_test.go rename to internal/runtime/agent/compact_announce_test.go index 3aff4799b9..f2a0035f84 100644 --- a/internal/agent/compact_announce_test.go +++ b/internal/runtime/agent/compact_announce_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A hand-typed /compact over a history with failed commands: the card has to go diff --git a/internal/agent/compact_backstop_test.go b/internal/runtime/agent/compact_backstop_test.go similarity index 97% rename from internal/agent/compact_backstop_test.go rename to internal/runtime/agent/compact_backstop_test.go index 143166bc9c..d9b52dd9fd 100644 --- a/internal/agent/compact_backstop_test.go +++ b/internal/runtime/agent/compact_backstop_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A digest that carried everything costs no extra tokens: the backstop exists diff --git a/internal/agent/compact_commit.go b/internal/runtime/agent/compact_commit.go similarity index 99% rename from internal/agent/compact_commit.go rename to internal/runtime/agent/compact_commit.go index a4c661569f..9f298d55cc 100644 --- a/internal/agent/compact_commit.go +++ b/internal/runtime/agent/compact_commit.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) type summaryProjectionCommit struct { diff --git a/internal/agent/compact_commit_emit_test.go b/internal/runtime/agent/compact_commit_emit_test.go similarity index 98% rename from internal/agent/compact_commit_emit_test.go rename to internal/runtime/agent/compact_commit_emit_test.go index 46e326be1d..8a4955850a 100644 --- a/internal/agent/compact_commit_emit_test.go +++ b/internal/runtime/agent/compact_commit_emit_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/fileutil" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // reentrantSnapshotSink re-enters ContextMaintenanceSnapshot on every emit, diff --git a/internal/agent/compact_coverage.go b/internal/runtime/agent/compact_coverage.go similarity index 98% rename from internal/agent/compact_coverage.go rename to internal/runtime/agent/compact_coverage.go index c44e8e5bb6..fbcee2f0c0 100644 --- a/internal/agent/compact_coverage.go +++ b/internal/runtime/agent/compact_coverage.go @@ -8,9 +8,9 @@ import ( "slices" "strings" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) // Acceptance used to ask a digest one question: is it smaller? A digest that diff --git a/internal/agent/compact_coverage_test.go b/internal/runtime/agent/compact_coverage_test.go similarity index 97% rename from internal/agent/compact_coverage_test.go rename to internal/runtime/agent/compact_coverage_test.go index 00e4c94825..1027d4843f 100644 --- a/internal/agent/compact_coverage_test.go +++ b/internal/runtime/agent/compact_coverage_test.go @@ -7,11 +7,11 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // coverageTools answers from the shipped registry rather than a copy of it, so diff --git a/internal/agent/compact_fold_input.go b/internal/runtime/agent/compact_fold_input.go similarity index 99% rename from internal/agent/compact_fold_input.go rename to internal/runtime/agent/compact_fold_input.go index 38ae5fd7f4..5fb230131e 100644 --- a/internal/agent/compact_fold_input.go +++ b/internal/runtime/agent/compact_fold_input.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // Summary input construction is internal to a summary transaction. The normal diff --git a/internal/agent/compact_fold_input_test.go b/internal/runtime/agent/compact_fold_input_test.go similarity index 98% rename from internal/agent/compact_fold_input_test.go rename to internal/runtime/agent/compact_fold_input_test.go index 379a03fd0f..3e27441da3 100644 --- a/internal/agent/compact_fold_input_test.go +++ b/internal/runtime/agent/compact_fold_input_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // countingProvider records every summarizer call so tests can assert that a diff --git a/internal/agent/compact_incremental_test.go b/internal/runtime/agent/compact_incremental_test.go similarity index 96% rename from internal/agent/compact_incremental_test.go rename to internal/runtime/agent/compact_incremental_test.go index 1430c0c143..7653123ca9 100644 --- a/internal/agent/compact_incremental_test.go +++ b/internal/runtime/agent/compact_incremental_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // Automatic maintenance always folds the model-visible view (prior digest + diff --git a/internal/agent/compact_index.go b/internal/runtime/agent/compact_index.go similarity index 98% rename from internal/agent/compact_index.go rename to internal/runtime/agent/compact_index.go index 4fc480153d..f7a2738111 100644 --- a/internal/agent/compact_index.go +++ b/internal/runtime/agent/compact_index.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "reasonix/internal/ablation" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) // A digest carries what the fold changed and what failed; everything else diff --git a/internal/agent/compact_index_test.go b/internal/runtime/agent/compact_index_test.go similarity index 98% rename from internal/agent/compact_index_test.go rename to internal/runtime/agent/compact_index_test.go index 5cda6b7eb5..9a88f1ce34 100644 --- a/internal/agent/compact_index_test.go +++ b/internal/runtime/agent/compact_index_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func indexRegion() []provider.Message { @@ -38,7 +38,7 @@ func TestFoldIndexBudgetIsSpentInTokens(t *testing.T) { a := indexAgent() entries := make([]foldIndexEntry, 40) for i := range entries { - entries[i] = foldIndexEntry{Canonical: i, Kind: "read_file", Subject: "internal/agent/compact_index.go", rank: rankRead} + entries[i] = foldIndexEntry{Canonical: i, Kind: "read_file", Subject: "internal/runtime/agent/compact_index.go", rank: rankRead} } digest := a.attachFoldIndex("## Goal\nship it", "", entries) if kept := strings.Count(digest, "read_file"); kept < len(entries) { diff --git a/internal/agent/compact_longhorizon_test.go b/internal/runtime/agent/compact_longhorizon_test.go similarity index 99% rename from internal/agent/compact_longhorizon_test.go rename to internal/runtime/agent/compact_longhorizon_test.go index 27d3bd4bfe..8c1b722949 100644 --- a/internal/agent/compact_longhorizon_test.go +++ b/internal/runtime/agent/compact_longhorizon_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // Long-horizon retrievability: after N compactions, can the agent still reach a diff --git a/internal/agent/compact_loop_e2e_test.go b/internal/runtime/agent/compact_loop_e2e_test.go similarity index 99% rename from internal/agent/compact_loop_e2e_test.go rename to internal/runtime/agent/compact_loop_e2e_test.go index 4a79112974..5a386454f6 100644 --- a/internal/agent/compact_loop_e2e_test.go +++ b/internal/runtime/agent/compact_loop_e2e_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) // fatTool returns a fixed-size blob, standing in for a real read_file / bash diff --git a/internal/agent/compact_manual_scope_test.go b/internal/runtime/agent/compact_manual_scope_test.go similarity index 97% rename from internal/agent/compact_manual_scope_test.go rename to internal/runtime/agent/compact_manual_scope_test.go index ba696bc911..0eab776219 100644 --- a/internal/agent/compact_manual_scope_test.go +++ b/internal/runtime/agent/compact_manual_scope_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // manualAgent sits well below the trigger, which is where a hand-typed compact diff --git a/internal/agent/compact_manual_verdict_test.go b/internal/runtime/agent/compact_manual_verdict_test.go similarity index 93% rename from internal/agent/compact_manual_verdict_test.go rename to internal/runtime/agent/compact_manual_verdict_test.go index 93d7be7990..b4a2128632 100644 --- a/internal/agent/compact_manual_verdict_test.go +++ b/internal/runtime/agent/compact_manual_verdict_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A hand-typed /compact on a transcript with nothing to fold used to answer with diff --git a/internal/agent/compact_partition_test.go b/internal/runtime/agent/compact_partition_test.go similarity index 99% rename from internal/agent/compact_partition_test.go rename to internal/runtime/agent/compact_partition_test.go index 58b2c10978..05cc654b02 100644 --- a/internal/agent/compact_partition_test.go +++ b/internal/runtime/agent/compact_partition_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // partitionCoversRegion is the invariant that makes a lost user turn impossible: diff --git a/internal/agent/compact_plan_bench_test.go b/internal/runtime/agent/compact_plan_bench_test.go similarity index 100% rename from internal/agent/compact_plan_bench_test.go rename to internal/runtime/agent/compact_plan_bench_test.go diff --git a/internal/agent/compact_plan_test.go b/internal/runtime/agent/compact_plan_test.go similarity index 99% rename from internal/agent/compact_plan_test.go rename to internal/runtime/agent/compact_plan_test.go index 9091182949..d5eea53c8d 100644 --- a/internal/agent/compact_plan_test.go +++ b/internal/runtime/agent/compact_plan_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // foldFixture is a transcript shaped like a real tool-driven run: fat tool-call diff --git a/internal/agent/compact_projection.go b/internal/runtime/agent/compact_projection.go similarity index 99% rename from internal/agent/compact_projection.go rename to internal/runtime/agent/compact_projection.go index d59f57352a..96b2012e51 100644 --- a/internal/agent/compact_projection.go +++ b/internal/runtime/agent/compact_projection.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) const ( diff --git a/internal/agent/compact_raw_output_test.go b/internal/runtime/agent/compact_raw_output_test.go similarity index 99% rename from internal/agent/compact_raw_output_test.go rename to internal/runtime/agent/compact_raw_output_test.go index e205e66533..c87dfb5cdc 100644 --- a/internal/agent/compact_raw_output_test.go +++ b/internal/runtime/agent/compact_raw_output_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) const rawOnlySentinel = "RAW-ONLY-SENTINEL" diff --git a/internal/agent/compact_recall.go b/internal/runtime/agent/compact_recall.go similarity index 97% rename from internal/agent/compact_recall.go rename to internal/runtime/agent/compact_recall.go index 029bafceb8..550bf58c64 100644 --- a/internal/agent/compact_recall.go +++ b/internal/runtime/agent/compact_recall.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "reasonix/internal/ablation" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A fold's index gives an address; recall is what reads it. The budget is per diff --git a/internal/agent/compact_recall_test.go b/internal/runtime/agent/compact_recall_test.go similarity index 96% rename from internal/agent/compact_recall_test.go rename to internal/runtime/agent/compact_recall_test.go index 0e2094d766..f23938c084 100644 --- a/internal/agent/compact_recall_test.go +++ b/internal/runtime/agent/compact_recall_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // recallAgent holds a transcript whose first `covered` messages have been @@ -18,7 +18,7 @@ func recallAgent(t *testing.T, covered int, window int) *Agent { sess := NewSession("system") sess.Add(provider.Message{Role: provider.RoleUser, Content: "never rewrite history, only append"}) sess.Add(provider.Message{Role: provider.RoleAssistant, ToolCalls: []provider.ToolCall{ - {ID: "c1", Name: "read_file", Arguments: `{"path":"internal/agent/compact.go"}`}, + {ID: "c1", Name: "read_file", Arguments: `{"path":"internal/runtime/agent/compact.go"}`}, }}) sess.Add(provider.Message{Role: provider.RoleTool, ToolCallID: "c1", Name: "read_file", Content: "func estimateTextTokens(s string) int {"}) sess.Add(provider.Message{Role: provider.RoleUser, Content: "keep going"}) diff --git a/internal/agent/compact_repair_test.go b/internal/runtime/agent/compact_repair_test.go similarity index 99% rename from internal/agent/compact_repair_test.go rename to internal/runtime/agent/compact_repair_test.go index 213f698f85..2f168ddaf9 100644 --- a/internal/agent/compact_repair_test.go +++ b/internal/runtime/agent/compact_repair_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // A fold whose region carries a sentinel only the raw transcript holds, and a diff --git a/internal/agent/compact_retry_test.go b/internal/runtime/agent/compact_retry_test.go similarity index 95% rename from internal/agent/compact_retry_test.go rename to internal/runtime/agent/compact_retry_test.go index 34ce94790e..5daa411b4f 100644 --- a/internal/agent/compact_retry_test.go +++ b/internal/runtime/agent/compact_retry_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" ) func TestMaybeCompactIgnoresRetryAggregateBelowContextThreshold(t *testing.T) { diff --git a/internal/agent/compact_search.go b/internal/runtime/agent/compact_search.go similarity index 98% rename from internal/agent/compact_search.go rename to internal/runtime/agent/compact_search.go index 8b7941ebcd..fabfaabc16 100644 --- a/internal/agent/compact_search.go +++ b/internal/runtime/agent/compact_search.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "reasonix/internal/provider" - "reasonix/internal/retrieval" - "reasonix/internal/tool" + "reasonix/internal/base/retrieval" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // Search runs against the canonical transcript, never the projection: an diff --git a/internal/agent/compact_search_test.go b/internal/runtime/agent/compact_search_test.go similarity index 99% rename from internal/agent/compact_search_test.go rename to internal/runtime/agent/compact_search_test.go index 6092ac8962..e05385df21 100644 --- a/internal/agent/compact_search_test.go +++ b/internal/runtime/agent/compact_search_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // obscureConstraint is a fact stated once, early, that no later turn repeats. diff --git a/internal/agent/compact_summary_failure_test.go b/internal/runtime/agent/compact_summary_failure_test.go similarity index 98% rename from internal/agent/compact_summary_failure_test.go rename to internal/runtime/agent/compact_summary_failure_test.go index 67d525c006..3bf6a833f6 100644 --- a/internal/agent/compact_summary_failure_test.go +++ b/internal/runtime/agent/compact_summary_failure_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // foldableSessionOverForce builds a transcript whose bulk is assistant text, so diff --git a/internal/agent/compact_tail_trigger_test.go b/internal/runtime/agent/compact_tail_trigger_test.go similarity index 95% rename from internal/agent/compact_tail_trigger_test.go rename to internal/runtime/agent/compact_tail_trigger_test.go index d23abca55e..a7981d1290 100644 --- a/internal/agent/compact_tail_trigger_test.go +++ b/internal/runtime/agent/compact_tail_trigger_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/model/openai" ) // oneTurnMock keeps a single turn going for rounds tool calls before answering, diff --git a/internal/agent/compact_test.go b/internal/runtime/agent/compact_test.go similarity index 99% rename from internal/agent/compact_test.go rename to internal/runtime/agent/compact_test.go index a6224ad645..9ffa44e6cf 100644 --- a/internal/agent/compact_test.go +++ b/internal/runtime/agent/compact_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // prepareForObservedUsage preserves the old synthetic-usage test ergonomics diff --git a/internal/agent/compact_threshold_test.go b/internal/runtime/agent/compact_threshold_test.go similarity index 100% rename from internal/agent/compact_threshold_test.go rename to internal/runtime/agent/compact_threshold_test.go diff --git a/internal/agent/compact_user_turns.go b/internal/runtime/agent/compact_user_turns.go similarity index 97% rename from internal/agent/compact_user_turns.go rename to internal/runtime/agent/compact_user_turns.go index 4ce8c9250e..1c495b0b72 100644 --- a/internal/agent/compact_user_turns.go +++ b/internal/runtime/agent/compact_user_turns.go @@ -3,8 +3,8 @@ package agent import ( "fmt" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // userTurnRetention is what one fold could and could not hold verbatim. A diff --git a/internal/agent/compact_user_turns_test.go b/internal/runtime/agent/compact_user_turns_test.go similarity index 97% rename from internal/agent/compact_user_turns_test.go rename to internal/runtime/agent/compact_user_turns_test.go index b337b01597..8c3d0d4fb5 100644 --- a/internal/agent/compact_user_turns_test.go +++ b/internal/runtime/agent/compact_user_turns_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // retentionSession puts one user turn of the given size in the fold region, diff --git a/internal/agent/compaction_budgets_test.go b/internal/runtime/agent/compaction_budgets_test.go similarity index 97% rename from internal/agent/compaction_budgets_test.go rename to internal/runtime/agent/compaction_budgets_test.go index fa7258c80e..a1e8ea8b17 100644 --- a/internal/agent/compaction_budgets_test.go +++ b/internal/runtime/agent/compaction_budgets_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // The keep budget is a share of the window, not a fixed token count. A user on diff --git a/internal/agent/complete_step_e2e_test.go b/internal/runtime/agent/complete_step_e2e_test.go similarity index 98% rename from internal/agent/complete_step_e2e_test.go rename to internal/runtime/agent/complete_step_e2e_test.go index 69e6de53a7..09fbce1272 100644 --- a/internal/agent/complete_step_e2e_test.go +++ b/internal/runtime/agent/complete_step_e2e_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" + "reasonix/internal/runtime/evidence" - _ "reasonix/internal/tool/builtin" + _ "reasonix/internal/tools/builtin" ) type stubBash struct{} diff --git a/internal/agent/complete_subtask.go b/internal/runtime/agent/complete_subtask.go similarity index 98% rename from internal/agent/complete_subtask.go rename to internal/runtime/agent/complete_subtask.go index 63a16f42c0..388ef66520 100644 --- a/internal/agent/complete_subtask.go +++ b/internal/runtime/agent/complete_subtask.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "reasonix/internal/evidence" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // CompleteSubtaskTool is visible only inside sub-agent registries. It ends a diff --git a/internal/agent/complete_subtask_test.go b/internal/runtime/agent/complete_subtask_test.go similarity index 95% rename from internal/agent/complete_subtask_test.go rename to internal/runtime/agent/complete_subtask_test.go index 16bf241db5..43a3ac9103 100644 --- a/internal/agent/complete_subtask_test.go +++ b/internal/runtime/agent/complete_subtask_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func submitCompleteSubtask(t *testing.T, led *evidence.Ledger, args string) string { @@ -186,9 +186,9 @@ func TestCompleteSubtaskRejectionNamesWhatTheHostLookedFor(t *testing.T) { args := []byte(`{"status":"complete","summary":"done", "acceptance_criteria":[ {"id":"c1","status":"satisfied","evidence":[ - {"kind":"files","summary":"read the files","paths":["internal/agent/agent.go","internal/agent/run_loop.go"]}]}, + {"kind":"files","summary":"read the files","paths":["internal/runtime/agent/agent.go","internal/runtime/agent/run_loop.go"]}]}, {"id":"c2","status":"satisfied","evidence":[ - {"kind":"verification","summary":"ran the tests","command":"go test ./internal/agent/"}]}, + {"kind":"verification","summary":"ran the tests","command":"go test ./internal/runtime/agent/"}]}, {"id":"c3","status":"satisfied","evidence":[ {"kind":"review","summary":"first reviewer"}, {"kind":"review","summary":"second reviewer"}]}]}`) @@ -204,8 +204,8 @@ func TestCompleteSubtaskRejectionNamesWhatTheHostLookedFor(t *testing.T) { t.Errorf("one missing receipt is reported %d times, which reads as %d problems:\n%s", n, n, out) } for _, want := range []string{ - "c1:", "no read or write recorded for", "internal/agent/agent.go", - "c2:", "no successful run of", "go test ./internal/agent/", + "c1:", "no read or write recorded for", "internal/runtime/agent/agent.go", + "c2:", "no successful run of", "go test ./internal/runtime/agent/", } { if !strings.Contains(out, want) { t.Errorf("verdict does not say %q; the sub-agent cannot tell what to fix:\n%s", want, out) diff --git a/internal/agent/completion_receipt_test.go b/internal/runtime/agent/completion_receipt_test.go similarity index 95% rename from internal/agent/completion_receipt_test.go rename to internal/runtime/agent/completion_receipt_test.go index f7df788ce4..ae209dbd7a 100644 --- a/internal/agent/completion_receipt_test.go +++ b/internal/runtime/agent/completion_receipt_test.go @@ -3,9 +3,9 @@ package agent import ( "testing" - "reasonix/internal/completion" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/completion" + "reasonix/internal/runtime/evidence" ) func TestReceiptCarriesWhatProseDoesNot(t *testing.T) { diff --git a/internal/agent/completion_shadow.go b/internal/runtime/agent/completion_shadow.go similarity index 95% rename from internal/agent/completion_shadow.go rename to internal/runtime/agent/completion_shadow.go index b9c994d166..ed4fc7610e 100644 --- a/internal/agent/completion_shadow.go +++ b/internal/runtime/agent/completion_shadow.go @@ -1,9 +1,9 @@ package agent import ( - "reasonix/internal/completion" - "reasonix/internal/event" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/event" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/completion" ) // completionReportAudit reduces a completion report to its content-free diff --git a/internal/agent/completion_shadow_test.go b/internal/runtime/agent/completion_shadow_test.go similarity index 97% rename from internal/agent/completion_shadow_test.go rename to internal/runtime/agent/completion_shadow_test.go index 078555f069..f2be77c5ff 100644 --- a/internal/agent/completion_shadow_test.go +++ b/internal/runtime/agent/completion_shadow_test.go @@ -4,9 +4,9 @@ import ( "slices" "testing" - "reasonix/internal/completion" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/completion" + "reasonix/internal/runtime/evidence" ) func shadowReport(input string, receipts ...evidence.Receipt) (event.ContractShadowAudit, event.CompletionReportAudit) { diff --git a/internal/agent/compress_tool_test.go b/internal/runtime/agent/compress_tool_test.go similarity index 99% rename from internal/agent/compress_tool_test.go rename to internal/runtime/agent/compress_tool_test.go index 98582d5214..5e12abd902 100644 --- a/internal/agent/compress_tool_test.go +++ b/internal/runtime/agent/compress_tool_test.go @@ -9,10 +9,10 @@ import ( "sync/atomic" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestCompressContextBeforePreservesCanonicalAndTail(t *testing.T) { diff --git a/internal/agent/conclude_blocked.go b/internal/runtime/agent/conclude_blocked.go similarity index 99% rename from internal/agent/conclude_blocked.go rename to internal/runtime/agent/conclude_blocked.go index 5b8ea06740..60d38868d7 100644 --- a/internal/agent/conclude_blocked.go +++ b/internal/runtime/agent/conclude_blocked.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // ConcludeBlockedTool is the execution turn's honest exit. The host otherwise diff --git a/internal/agent/conclude_blocked_test.go b/internal/runtime/agent/conclude_blocked_test.go similarity index 98% rename from internal/agent/conclude_blocked_test.go rename to internal/runtime/agent/conclude_blocked_test.go index c6e3393e23..01f3be8d50 100644 --- a/internal/agent/conclude_blocked_test.go +++ b/internal/runtime/agent/conclude_blocked_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/evidence" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/evidence" ) func blockedCtx(ledger *evidence.Ledger) context.Context { diff --git a/internal/agent/conclude_no_changes.go b/internal/runtime/agent/conclude_no_changes.go similarity index 98% rename from internal/agent/conclude_no_changes.go rename to internal/runtime/agent/conclude_no_changes.go index 3cdc33e33a..1fd3c0e278 100644 --- a/internal/agent/conclude_no_changes.go +++ b/internal/runtime/agent/conclude_no_changes.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // ConcludeNoChangesTool is the planner's other structured exit. A turn that diff --git a/internal/agent/context_breakdown.go b/internal/runtime/agent/context_breakdown.go similarity index 98% rename from internal/agent/context_breakdown.go rename to internal/runtime/agent/context_breakdown.go index b4753df673..efc4c770a6 100644 --- a/internal/agent/context_breakdown.go +++ b/internal/runtime/agent/context_breakdown.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // ContextBreakdown says where the prompt's tokens went. "How full" is only // actionable once you know what is filling it — a memory file, a tool diff --git a/internal/agent/context_breakdown_test.go b/internal/runtime/agent/context_breakdown_test.go similarity index 98% rename from internal/agent/context_breakdown_test.go rename to internal/runtime/agent/context_breakdown_test.go index ff75b12459..867826eead 100644 --- a/internal/agent/context_breakdown_test.go +++ b/internal/runtime/agent/context_breakdown_test.go @@ -3,7 +3,7 @@ package agent import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // The gauge says a session is at 70%; this says what put it there. Each class diff --git a/internal/agent/context_budget.go b/internal/runtime/agent/context_budget.go similarity index 99% rename from internal/agent/context_budget.go rename to internal/runtime/agent/context_budget.go index 73ff30d4ce..a2618fbb76 100644 --- a/internal/agent/context_budget.go +++ b/internal/runtime/agent/context_budget.go @@ -3,7 +3,7 @@ package agent import ( "fmt" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // contextBudgetNoticeRatios are the fractions of the distance to the compaction diff --git a/internal/agent/context_budget_test.go b/internal/runtime/agent/context_budget_test.go similarity index 98% rename from internal/agent/context_budget_test.go rename to internal/runtime/agent/context_budget_test.go index 8b3c65df72..db56f7f96f 100644 --- a/internal/agent/context_budget_test.go +++ b/internal/runtime/agent/context_budget_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // gen names one model-visible history build; a fold moves the projection. diff --git a/internal/agent/context_capsule.go b/internal/runtime/agent/context_capsule.go similarity index 100% rename from internal/agent/context_capsule.go rename to internal/runtime/agent/context_capsule.go diff --git a/internal/agent/context_capsule_test.go b/internal/runtime/agent/context_capsule_test.go similarity index 99% rename from internal/agent/context_capsule_test.go rename to internal/runtime/agent/context_capsule_test.go index b01995351f..7831727c72 100644 --- a/internal/agent/context_capsule_test.go +++ b/internal/runtime/agent/context_capsule_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func capsuleForSpec(t *testing.T, spec SubagentSpec) ContextCapsule { diff --git a/internal/agent/context_editing_test.go b/internal/runtime/agent/context_editing_test.go similarity index 92% rename from internal/agent/context_editing_test.go rename to internal/runtime/agent/context_editing_test.go index e10f875606..8daad15496 100644 --- a/internal/agent/context_editing_test.go +++ b/internal/runtime/agent/context_editing_test.go @@ -3,8 +3,8 @@ package agent import ( "testing" - "reasonix/internal/event" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) // Native provider context editing was removed. All providers use the local diff --git a/internal/agent/context_generation.go b/internal/runtime/agent/context_generation.go similarity index 100% rename from internal/agent/context_generation.go rename to internal/runtime/agent/context_generation.go diff --git a/internal/agent/context_maintenance_issue7935_test.go b/internal/runtime/agent/context_maintenance_issue7935_test.go similarity index 95% rename from internal/agent/context_maintenance_issue7935_test.go rename to internal/runtime/agent/context_maintenance_issue7935_test.go index 5f0ec339b6..47dffd2dd4 100644 --- a/internal/agent/context_maintenance_issue7935_test.go +++ b/internal/runtime/agent/context_maintenance_issue7935_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // Issue #7935 used to install prune projections every time many tool results diff --git a/internal/agent/context_maintenance_restart_test.go b/internal/runtime/agent/context_maintenance_restart_test.go similarity index 97% rename from internal/agent/context_maintenance_restart_test.go rename to internal/runtime/agent/context_maintenance_restart_test.go index 7c767665d3..0ebb03e852 100644 --- a/internal/agent/context_maintenance_restart_test.go +++ b/internal/runtime/agent/context_maintenance_restart_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) const restartMaintenanceWindow = 1_000_000 diff --git a/internal/agent/context_manager.go b/internal/runtime/agent/context_manager.go similarity index 99% rename from internal/agent/context_manager.go rename to internal/runtime/agent/context_manager.go index a4915a94b1..75d1c28120 100644 --- a/internal/agent/context_manager.go +++ b/internal/runtime/agent/context_manager.go @@ -6,7 +6,7 @@ import ( "fmt" "log/slog" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // compactionProgress is how compaction is faring in this session: whether a diff --git a/internal/agent/context_manager_test.go b/internal/runtime/agent/context_manager_test.go similarity index 96% rename from internal/agent/context_manager_test.go rename to internal/runtime/agent/context_manager_test.go index 0c2f9793f5..0504562e02 100644 --- a/internal/agent/context_manager_test.go +++ b/internal/runtime/agent/context_manager_test.go @@ -9,12 +9,12 @@ import ( "sync/atomic" "testing" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" ) type failingSummaryProvider struct{ calls int } diff --git a/internal/agent/context_overflow.go b/internal/runtime/agent/context_overflow.go similarity index 98% rename from internal/agent/context_overflow.go rename to internal/runtime/agent/context_overflow.go index dd956f0d18..616e8869a9 100644 --- a/internal/agent/context_overflow.go +++ b/internal/runtime/agent/context_overflow.go @@ -4,7 +4,7 @@ import ( "context" "sync/atomic" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // contextWindowProbe is what an endpoint that declares no window still tells us diff --git a/internal/agent/context_overflow_test.go b/internal/runtime/agent/context_overflow_test.go similarity index 96% rename from internal/agent/context_overflow_test.go rename to internal/runtime/agent/context_overflow_test.go index 4325538d93..6d2e204050 100644 --- a/internal/agent/context_overflow_test.go +++ b/internal/runtime/agent/context_overflow_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" ) func contextOverflowRejection() error { diff --git a/internal/agent/context_receipt.go b/internal/runtime/agent/context_receipt.go similarity index 99% rename from internal/agent/context_receipt.go rename to internal/runtime/agent/context_receipt.go index 0dfe3a6f9b..c61d983657 100644 --- a/internal/agent/context_receipt.go +++ b/internal/runtime/agent/context_receipt.go @@ -7,8 +7,8 @@ import ( "log/slog" "time" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) func (a *Agent) contextMaintenanceInputHash(visible []provider.Message) string { diff --git a/internal/agent/context_report.go b/internal/runtime/agent/context_report.go similarity index 98% rename from internal/agent/context_report.go rename to internal/runtime/agent/context_report.go index 9337a468bc..3d1a802e92 100644 --- a/internal/agent/context_report.go +++ b/internal/runtime/agent/context_report.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // ContextReport is a point-in-time view of context pressure: the declared // window, the thresholds derived from it, what the model currently sees, and how diff --git a/internal/agent/context_report_test.go b/internal/runtime/agent/context_report_test.go similarity index 94% rename from internal/agent/context_report_test.go rename to internal/runtime/agent/context_report_test.go index 0e9eec63bc..f01d59ae9f 100644 --- a/internal/agent/context_report_test.go +++ b/internal/runtime/agent/context_report_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A retry aggregate is billable tokens, not context shape. Reporting it would diff --git a/internal/agent/context_status.go b/internal/runtime/agent/context_status.go similarity index 98% rename from internal/agent/context_status.go rename to internal/runtime/agent/context_status.go index ebd631e6e5..b3391df0a3 100644 --- a/internal/agent/context_status.go +++ b/internal/runtime/agent/context_status.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // ContextMaintenanceSnapshot is a read-only view of the current provider-bound // context. It separates present composition from cumulative summary-call cost. diff --git a/internal/agent/context_usage.go b/internal/runtime/agent/context_usage.go similarity index 97% rename from internal/agent/context_usage.go rename to internal/runtime/agent/context_usage.go index b4f116e5a0..d357e1aff4 100644 --- a/internal/agent/context_usage.go +++ b/internal/runtime/agent/context_usage.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/tool" +import "reasonix/internal/contract/tool" // contextUsage memoises the projected prompt size. The estimate walks every // visible message, and status gauges redraw far more often than the view moves, diff --git a/internal/agent/context_usage_test.go b/internal/runtime/agent/context_usage_test.go similarity index 97% rename from internal/agent/context_usage_test.go rename to internal/runtime/agent/context_usage_test.go index 5b23129a11..b5693fb81a 100644 --- a/internal/agent/context_usage_test.go +++ b/internal/runtime/agent/context_usage_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // bigSchemaTool mimics a real built-in tool whose JSON schema is large enough diff --git a/internal/agent/contextual_reason_test.go b/internal/runtime/agent/contextual_reason_test.go similarity index 93% rename from internal/agent/contextual_reason_test.go rename to internal/runtime/agent/contextual_reason_test.go index d3ba659463..f96bef544b 100644 --- a/internal/agent/contextual_reason_test.go +++ b/internal/runtime/agent/contextual_reason_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) -// The contract internal/tool enforces over the built-ins, over the tools this +// The contract internal/contract/tool enforces over the built-ins, over the tools this // package owns. Listed explicitly because these are constructed by the host // rather than registered globally — a new one has to be added here, which is // the point at which its author is asked for the reason and for which host diff --git a/internal/agent/contextual_tool_test.go b/internal/runtime/agent/contextual_tool_test.go similarity index 97% rename from internal/agent/contextual_tool_test.go rename to internal/runtime/agent/contextual_tool_test.go index 92a8cee265..9c2250d058 100644 --- a/internal/agent/contextual_tool_test.go +++ b/internal/runtime/agent/contextual_tool_test.go @@ -7,9 +7,9 @@ import ( "sync/atomic" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type unavailableTool struct { diff --git a/internal/agent/contract_shadow.go b/internal/runtime/agent/contract_shadow.go similarity index 97% rename from internal/agent/contract_shadow.go rename to internal/runtime/agent/contract_shadow.go index ccdd41c6b7..9f64eacdac 100644 --- a/internal/agent/contract_shadow.go +++ b/internal/runtime/agent/contract_shadow.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "reasonix/internal/completion" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/plancontract" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/event" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/completion" + "reasonix/internal/runtime/evidence" ) // buildShadowContract replays a finished turn's receipts into a task diff --git a/internal/agent/contract_shadow_test.go b/internal/runtime/agent/contract_shadow_test.go similarity index 98% rename from internal/agent/contract_shadow_test.go rename to internal/runtime/agent/contract_shadow_test.go index b62734790f..05ab8a7aab 100644 --- a/internal/agent/contract_shadow_test.go +++ b/internal/runtime/agent/contract_shadow_test.go @@ -3,7 +3,7 @@ package agent import ( "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) func TestBuildShadowContractReplaysTheTurn(t *testing.T) { diff --git a/internal/agent/coordinator.go b/internal/runtime/agent/coordinator.go similarity index 99% rename from internal/agent/coordinator.go rename to internal/runtime/agent/coordinator.go index f71cbe1574..5f851df51b 100644 --- a/internal/agent/coordinator.go +++ b/internal/runtime/agent/coordinator.go @@ -7,13 +7,13 @@ import ( "strings" "time" - "reasonix/internal/event" - "reasonix/internal/nilutil" - "reasonix/internal/plancontract" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" ) // Runner carries out one task turn. Both Agent (single model) and Coordinator diff --git a/internal/agent/coordinator_rollback.go b/internal/runtime/agent/coordinator_rollback.go similarity index 95% rename from internal/agent/coordinator_rollback.go rename to internal/runtime/agent/coordinator_rollback.go index 1f9471ca30..5fac9cbf4f 100644 --- a/internal/agent/coordinator_rollback.go +++ b/internal/runtime/agent/coordinator_rollback.go @@ -3,7 +3,7 @@ package agent import ( "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // rollbackPlannerTurn restores the snapshot unless compaction rewrote it. diff --git a/internal/agent/coordinator_test.go b/internal/runtime/agent/coordinator_test.go similarity index 99% rename from internal/agent/coordinator_test.go rename to internal/runtime/agent/coordinator_test.go index 211ec17781..911b12179c 100644 --- a/internal/agent/coordinator_test.go +++ b/internal/runtime/agent/coordinator_test.go @@ -4,14 +4,14 @@ import ( "context" "encoding/json" "fmt" - "reasonix/internal/event" + "reasonix/internal/contract/event" "slices" "strconv" "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // mockProvider replays preset chunks and records the last request it received. diff --git a/internal/agent/criteria_receipt_test.go b/internal/runtime/agent/criteria_receipt_test.go similarity index 95% rename from internal/agent/criteria_receipt_test.go rename to internal/runtime/agent/criteria_receipt_test.go index bfded574e7..48fc95a55e 100644 --- a/internal/agent/criteria_receipt_test.go +++ b/internal/runtime/agent/criteria_receipt_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/diff" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/base/diff" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // previewingEdit is a writer that describes its change the way the file-editing diff --git a/internal/agent/criterion_proof_test.go b/internal/runtime/agent/criterion_proof_test.go similarity index 97% rename from internal/agent/criterion_proof_test.go rename to internal/runtime/agent/criterion_proof_test.go index 054dd99287..4c52eae3a9 100644 --- a/internal/agent/criterion_proof_test.go +++ b/internal/runtime/agent/criterion_proof_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - "reasonix/internal/evidence" - "reasonix/internal/plancontract" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/evidence" ) func completeStepReceipt(t *testing.T, criterionID, kind, command string) evidence.Receipt { diff --git a/internal/agent/declared_check_test.go b/internal/runtime/agent/declared_check_test.go similarity index 99% rename from internal/agent/declared_check_test.go rename to internal/runtime/agent/declared_check_test.go index 4b600d5c33..ef8c4f672d 100644 --- a/internal/agent/declared_check_test.go +++ b/internal/runtime/agent/declared_check_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func TestBashDeclaredCheck(t *testing.T) { diff --git a/internal/agent/delegated_agent.go b/internal/runtime/agent/delegated_agent.go similarity index 87% rename from internal/agent/delegated_agent.go rename to internal/runtime/agent/delegated_agent.go index 2f56698bd4..de150c38c1 100644 --- a/internal/agent/delegated_agent.go +++ b/internal/runtime/agent/delegated_agent.go @@ -4,9 +4,9 @@ package agent import ( "context" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // newDelegatedAgent builds that child, wiring what the call context decides diff --git a/internal/agent/delegation_capability.go b/internal/runtime/agent/delegation_capability.go similarity index 97% rename from internal/agent/delegation_capability.go rename to internal/runtime/agent/delegation_capability.go index bb23790314..14847058d9 100644 --- a/internal/agent/delegation_capability.go +++ b/internal/runtime/agent/delegation_capability.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strings" - "reasonix/internal/event" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) // The delegation namespace. These ids are the whole discovery surface for the diff --git a/internal/agent/delegation_capability_test.go b/internal/runtime/agent/delegation_capability_test.go similarity index 98% rename from internal/agent/delegation_capability_test.go rename to internal/runtime/agent/delegation_capability_test.go index c219938c7c..397b9bcee1 100644 --- a/internal/agent/delegation_capability_test.go +++ b/internal/runtime/agent/delegation_capability_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/capability" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/capability" ) // TestDelegationSurvivesTheProxyBoundary is the gate the frontend depended on diff --git a/internal/agent/delegation_lifecycle.go b/internal/runtime/agent/delegation_lifecycle.go similarity index 99% rename from internal/agent/delegation_lifecycle.go rename to internal/runtime/agent/delegation_lifecycle.go index bab7947818..8468a98c6a 100644 --- a/internal/agent/delegation_lifecycle.go +++ b/internal/runtime/agent/delegation_lifecycle.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/event" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" ) // delegationLifecycle is one lone delegation's record and its picture, kept as diff --git a/internal/agent/delegation_lifecycle_test.go b/internal/runtime/agent/delegation_lifecycle_test.go similarity index 98% rename from internal/agent/delegation_lifecycle_test.go rename to internal/runtime/agent/delegation_lifecycle_test.go index 0beb91604a..45ce216da0 100644 --- a/internal/agent/delegation_lifecycle_test.go +++ b/internal/runtime/agent/delegation_lifecycle_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/event" - "reasonix/internal/execjournal" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/jobs" + "reasonix/internal/state/execjournal" ) // A lone delegation reaches the same runner a fan-out item does and, until this diff --git a/internal/agent/delegation_origin_test.go b/internal/runtime/agent/delegation_origin_test.go similarity index 93% rename from internal/agent/delegation_origin_test.go rename to internal/runtime/agent/delegation_origin_test.go index 27b778f715..ef7f306259 100644 --- a/internal/agent/delegation_origin_test.go +++ b/internal/runtime/agent/delegation_origin_test.go @@ -5,11 +5,11 @@ import ( "encoding/json" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) type originProbe struct { diff --git a/internal/agent/delegation_proxy_test.go b/internal/runtime/agent/delegation_proxy_test.go similarity index 87% rename from internal/agent/delegation_proxy_test.go rename to internal/runtime/agent/delegation_proxy_test.go index 60a7a6eb3d..6368e0532e 100644 --- a/internal/agent/delegation_proxy_test.go +++ b/internal/runtime/agent/delegation_proxy_test.go @@ -5,13 +5,13 @@ import ( "encoding/json" "testing" - "reasonix/internal/capability" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/plugin" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/evidence" ) // A capability-proxied call must still produce the delegation receipt: the diff --git a/internal/agent/delivery_hardening_test.go b/internal/runtime/agent/delivery_hardening_test.go similarity index 99% rename from internal/agent/delivery_hardening_test.go rename to internal/runtime/agent/delivery_hardening_test.go index 45a9457797..e2b0bebc6e 100644 --- a/internal/agent/delivery_hardening_test.go +++ b/internal/runtime/agent/delivery_hardening_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - "reasonix/internal/capability" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/evidence" ) // fakeReadFileTool is a minimal read-only tool whose successful calls produce diff --git a/internal/agent/delivery_scope.go b/internal/runtime/agent/delivery_scope.go similarity index 100% rename from internal/agent/delivery_scope.go rename to internal/runtime/agent/delivery_scope.go diff --git a/internal/agent/delivery_scope_test.go b/internal/runtime/agent/delivery_scope_test.go similarity index 97% rename from internal/agent/delivery_scope_test.go rename to internal/runtime/agent/delivery_scope_test.go index 8b5294adfc..eddc87f43a 100644 --- a/internal/agent/delivery_scope_test.go +++ b/internal/runtime/agent/delivery_scope_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func TestDeliveryExecutionScopeDoesNotChangeProviderRequestBytes(t *testing.T) { diff --git a/internal/agent/delivery_visible_final_test.go b/internal/runtime/agent/delivery_visible_final_test.go similarity index 98% rename from internal/agent/delivery_visible_final_test.go rename to internal/runtime/agent/delivery_visible_final_test.go index 3f0dae9080..12ea45d5af 100644 --- a/internal/agent/delivery_visible_final_test.go +++ b/internal/runtime/agent/delivery_visible_final_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestRunSubAgentSalvagesCurrentAnswerBeforePairedGoalError(t *testing.T) { diff --git a/internal/agent/dependency_barrier_test.go b/internal/runtime/agent/dependency_barrier_test.go similarity index 98% rename from internal/agent/dependency_barrier_test.go rename to internal/runtime/agent/dependency_barrier_test.go index d44333d09c..8412476a6e 100644 --- a/internal/agent/dependency_barrier_test.go +++ b/internal/runtime/agent/dependency_barrier_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func barrierAgent(t *testing.T) *Agent { diff --git a/internal/agent/dependent_writer_preview_test.go b/internal/runtime/agent/dependent_writer_preview_test.go similarity index 96% rename from internal/agent/dependent_writer_preview_test.go rename to internal/runtime/agent/dependent_writer_preview_test.go index 58e47b985c..d04a4556e4 100644 --- a/internal/agent/dependent_writer_preview_test.go +++ b/internal/runtime/agent/dependent_writer_preview_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/tools/builtin" ) type mutateThenFailTool struct{ path string } diff --git a/internal/agent/dispatch_test.go b/internal/runtime/agent/dispatch_test.go similarity index 93% rename from internal/agent/dispatch_test.go rename to internal/runtime/agent/dispatch_test.go index 1871dd5602..921fab4338 100644 --- a/internal/agent/dispatch_test.go +++ b/internal/runtime/agent/dispatch_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // TestEarlyToolDispatch proves a ChunkToolCallStart surfaces a ToolDispatch diff --git a/internal/agent/economic_trigger_test.go b/internal/runtime/agent/economic_trigger_test.go similarity index 98% rename from internal/agent/economic_trigger_test.go rename to internal/runtime/agent/economic_trigger_test.go index 95fb6a5396..8fc857c2ea 100644 --- a/internal/agent/economic_trigger_test.go +++ b/internal/runtime/agent/economic_trigger_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // Capacity and economics answer different questions: how close the prompt is to diff --git a/internal/agent/empty_final_test.go b/internal/runtime/agent/empty_final_test.go similarity index 98% rename from internal/agent/empty_final_test.go rename to internal/runtime/agent/empty_final_test.go index 4a025a4f22..f27e8bc21d 100644 --- a/internal/agent/empty_final_test.go +++ b/internal/runtime/agent/empty_final_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestRunRetriesReasoningOnlyFinalAnswer(t *testing.T) { diff --git a/internal/agent/empty_session_gc.go b/internal/runtime/agent/empty_session_gc.go similarity index 97% rename from internal/agent/empty_session_gc.go rename to internal/runtime/agent/empty_session_gc.go index b8738bb95d..b3cea3d689 100644 --- a/internal/agent/empty_session_gc.go +++ b/internal/runtime/agent/empty_session_gc.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // reconcileSessionDir runs the directory-wide passes: sidecar reconciliation, diff --git a/internal/agent/empty_session_gc_test.go b/internal/runtime/agent/empty_session_gc_test.go similarity index 98% rename from internal/agent/empty_session_gc_test.go rename to internal/runtime/agent/empty_session_gc_test.go index 7631d0c1eb..080e587778 100644 --- a/internal/agent/empty_session_gc_test.go +++ b/internal/runtime/agent/empty_session_gc_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeAgedSession(t *testing.T, dir, name, body string, age time.Duration) string { diff --git a/internal/agent/errors.go b/internal/runtime/agent/errors.go similarity index 100% rename from internal/agent/errors.go rename to internal/runtime/agent/errors.go diff --git a/internal/agent/errors_test.go b/internal/runtime/agent/errors_test.go similarity index 100% rename from internal/agent/errors_test.go rename to internal/runtime/agent/errors_test.go diff --git a/internal/agent/estimation_surface_test.go b/internal/runtime/agent/estimation_surface_test.go similarity index 96% rename from internal/agent/estimation_surface_test.go rename to internal/runtime/agent/estimation_surface_test.go index a2ad6940a6..5364794254 100644 --- a/internal/agent/estimation_surface_test.go +++ b/internal/runtime/agent/estimation_surface_test.go @@ -6,9 +6,9 @@ import ( "slices" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type estimationProbe struct{ name string } diff --git a/internal/agent/evidence_flow_test.go b/internal/runtime/agent/evidence_flow_test.go similarity index 99% rename from internal/agent/evidence_flow_test.go rename to internal/runtime/agent/evidence_flow_test.go index 4f4ee47beb..9906767979 100644 --- a/internal/agent/evidence_flow_test.go +++ b/internal/runtime/agent/evidence_flow_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/instruction" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/instruction" ) // scriptedProvider replays a distinct chunk set per Stream call, so a multi-turn diff --git a/internal/agent/execute_batch.go b/internal/runtime/agent/execute_batch.go similarity index 99% rename from internal/agent/execute_batch.go rename to internal/runtime/agent/execute_batch.go index 31f78f6917..2f7e4844cf 100644 --- a/internal/agent/execute_batch.go +++ b/internal/runtime/agent/execute_batch.go @@ -6,11 +6,11 @@ import ( "sync" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/safety/permission" ) // barrierLevel is how far an earlier failure reaches: a failed modification may diff --git a/internal/agent/execute_one.go b/internal/runtime/agent/execute_one.go similarity index 99% rename from internal/agent/execute_one.go rename to internal/runtime/agent/execute_one.go index 6d08691e63..00ff3c1ca2 100644 --- a/internal/agent/execute_one.go +++ b/internal/runtime/agent/execute_one.go @@ -6,13 +6,13 @@ import ( "fmt" "strings" - "reasonix/internal/checkpoint" - "reasonix/internal/evidence" - "reasonix/internal/permission" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/shellrun" - "reasonix/internal/tool" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/safety/permission" + "reasonix/internal/state/checkpoint" + "reasonix/internal/tools/shellrun" ) // toolCallPlan holds the resolved, policy-checked state for one tool call. diff --git a/internal/agent/execution_identity.go b/internal/runtime/agent/execution_identity.go similarity index 100% rename from internal/agent/execution_identity.go rename to internal/runtime/agent/execution_identity.go diff --git a/internal/agent/execution_identity_test.go b/internal/runtime/agent/execution_identity_test.go similarity index 100% rename from internal/agent/execution_identity_test.go rename to internal/runtime/agent/execution_identity_test.go diff --git a/internal/agent/execution_record.go b/internal/runtime/agent/execution_record.go similarity index 98% rename from internal/agent/execution_record.go rename to internal/runtime/agent/execution_record.go index 45fec043e3..8ce2650428 100644 --- a/internal/agent/execution_record.go +++ b/internal/runtime/agent/execution_record.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "reasonix/internal/agentgraph" - "reasonix/internal/event" - "reasonix/internal/execjournal" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/state/execjournal" ) type turnIdentityContextKey struct{} diff --git a/internal/agent/execution_record_test.go b/internal/runtime/agent/execution_record_test.go similarity index 99% rename from internal/agent/execution_record_test.go rename to internal/runtime/agent/execution_record_test.go index 1d2a50ec0e..03f69883db 100644 --- a/internal/agent/execution_record_test.go +++ b/internal/runtime/agent/execution_record_test.go @@ -11,11 +11,11 @@ import ( "sync" "testing" - "reasonix/internal/agentgraph" - "reasonix/internal/event" - "reasonix/internal/execjournal" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/state/execjournal" ) // openingProbeSink reads the journal at the moment the graph first shows the diff --git a/internal/agent/extensions.go b/internal/runtime/agent/extensions.go similarity index 98% rename from internal/agent/extensions.go rename to internal/runtime/agent/extensions.go index da81fef30b..5e9770c1ee 100644 --- a/internal/agent/extensions.go +++ b/internal/runtime/agent/extensions.go @@ -7,11 +7,11 @@ import ( "reflect" "strings" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/providerconv" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/providerconv" ) // Extension Protocol v2 agent-side wiring. The agent consults the diff --git a/internal/agent/extensions_test.go b/internal/runtime/agent/extensions_test.go similarity index 99% rename from internal/agent/extensions_test.go rename to internal/runtime/agent/extensions_test.go index f1d9c75f6e..5421bd5300 100644 --- a/internal/agent/extensions_test.go +++ b/internal/runtime/agent/extensions_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/protocol" ) // Agent-loop wiring tests. The dispatcher under test is real; only diff --git a/internal/agent/failure_diagnosis.go b/internal/runtime/agent/failure_diagnosis.go similarity index 98% rename from internal/agent/failure_diagnosis.go rename to internal/runtime/agent/failure_diagnosis.go index ef15ef94b3..944b0cf9a5 100644 --- a/internal/agent/failure_diagnosis.go +++ b/internal/runtime/agent/failure_diagnosis.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // Which lines of a failed command's output carry the diagnosis is a reading diff --git a/internal/agent/failure_diagnosis_test.go b/internal/runtime/agent/failure_diagnosis_test.go similarity index 98% rename from internal/agent/failure_diagnosis_test.go rename to internal/runtime/agent/failure_diagnosis_test.go index 25f03d1d55..d864638663 100644 --- a/internal/agent/failure_diagnosis_test.go +++ b/internal/runtime/agent/failure_diagnosis_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/plancontract" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // The reply is model output, so it is parsed as untrusted input: anything that diff --git a/internal/agent/failure_snip.go b/internal/runtime/agent/failure_snip.go similarity index 99% rename from internal/agent/failure_snip.go rename to internal/runtime/agent/failure_snip.go index 4dc6ca7e7b..d1738f43ad 100644 --- a/internal/agent/failure_snip.go +++ b/internal/runtime/agent/failure_snip.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // Keeping a recorded failure whole is what makes a projection grow without diff --git a/internal/agent/failure_snip_langs_test.go b/internal/runtime/agent/failure_snip_langs_test.go similarity index 100% rename from internal/agent/failure_snip_langs_test.go rename to internal/runtime/agent/failure_snip_langs_test.go diff --git a/internal/agent/failure_snip_test.go b/internal/runtime/agent/failure_snip_test.go similarity index 98% rename from internal/agent/failure_snip_test.go rename to internal/runtime/agent/failure_snip_test.go index 6cd826c6d0..93bbe04125 100644 --- a/internal/agent/failure_snip_test.go +++ b/internal/runtime/agent/failure_snip_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func passingLog(n int) []string { diff --git a/internal/agent/failure_survives_folds_test.go b/internal/runtime/agent/failure_survives_folds_test.go similarity index 95% rename from internal/agent/failure_survives_folds_test.go rename to internal/runtime/agent/failure_survives_folds_test.go index 081864a990..363c6b8ce1 100644 --- a/internal/agent/failure_survives_folds_test.go +++ b/internal/runtime/agent/failure_survives_folds_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // goTestFailure is shaped like the real thing on purpose: a failing `go test` diff --git a/internal/agent/final_readiness.go b/internal/runtime/agent/final_readiness.go similarity index 99% rename from internal/agent/final_readiness.go rename to internal/runtime/agent/final_readiness.go index 6173e34207..36dda4d1ee 100644 --- a/internal/agent/final_readiness.go +++ b/internal/runtime/agent/final_readiness.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "reasonix/internal/ablation" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/instruction" - "reasonix/internal/taskpolicy" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/taskpolicy" + "reasonix/internal/state/instruction" ) // Final readiness: whether a turn has earned the right to stop. It reads the diff --git a/internal/agent/final_readiness_test.go b/internal/runtime/agent/final_readiness_test.go similarity index 98% rename from internal/agent/final_readiness_test.go rename to internal/runtime/agent/final_readiness_test.go index 8381382a0a..8182bb8e44 100644 --- a/internal/agent/final_readiness_test.go +++ b/internal/runtime/agent/final_readiness_test.go @@ -4,11 +4,11 @@ import ( "strings" "testing" - "reasonix/internal/evidence" - "reasonix/internal/instruction" - "reasonix/internal/provider" - "reasonix/internal/taskpolicy" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/taskpolicy" + "reasonix/internal/state/instruction" ) func readinessLedger(receipts ...evidence.Receipt) *evidence.Ledger { diff --git a/internal/agent/final_rejection_test.go b/internal/runtime/agent/final_rejection_test.go similarity index 96% rename from internal/agent/final_rejection_test.go rename to internal/runtime/agent/final_rejection_test.go index c981042a98..8da37d74d6 100644 --- a/internal/agent/final_rejection_test.go +++ b/internal/runtime/agent/final_rejection_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "reasonix/internal/evidence" - "reasonix/internal/plancontract" - "reasonix/internal/tool" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func rejectionAgent(t *testing.T, plan *plancontract.Plan) *Agent { diff --git a/internal/agent/finalization.go b/internal/runtime/agent/finalization.go similarity index 97% rename from internal/agent/finalization.go rename to internal/runtime/agent/finalization.go index b42a8447b2..ba5a74a883 100644 --- a/internal/agent/finalization.go +++ b/internal/runtime/agent/finalization.go @@ -3,8 +3,8 @@ package agent import ( "fmt" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // landCause is why a turn was told to finalize. kind selects the pause the Run diff --git a/internal/agent/fleet.go b/internal/runtime/agent/fleet.go similarity index 99% rename from internal/agent/fleet.go rename to internal/runtime/agent/fleet.go index 901b2396a8..6d0b63cf25 100644 --- a/internal/agent/fleet.go +++ b/internal/runtime/agent/fleet.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "reasonix/internal/ablation" - "reasonix/internal/agentgraph" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/jobs" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" ) const ( diff --git a/internal/agent/fleet_adopt.go b/internal/runtime/agent/fleet_adopt.go similarity index 100% rename from internal/agent/fleet_adopt.go rename to internal/runtime/agent/fleet_adopt.go diff --git a/internal/agent/fleet_adopt_test.go b/internal/runtime/agent/fleet_adopt_test.go similarity index 98% rename from internal/agent/fleet_adopt_test.go rename to internal/runtime/agent/fleet_adopt_test.go index d54751c919..2a65b1e78f 100644 --- a/internal/agent/fleet_adopt_test.go +++ b/internal/runtime/agent/fleet_adopt_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" - "reasonix/internal/agentgraph" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/agentgraph" ) func TestFleetItemShapeRequiresExactlyOneOfPromptAndAdoptRef(t *testing.T) { diff --git a/internal/agent/fleet_failure.go b/internal/runtime/agent/fleet_failure.go similarity index 98% rename from internal/agent/fleet_failure.go rename to internal/runtime/agent/fleet_failure.go index f8cddb240a..d30fa62605 100644 --- a/internal/agent/fleet_failure.go +++ b/internal/runtime/agent/fleet_failure.go @@ -3,7 +3,7 @@ package agent import ( "errors" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // fleetFailureClass is the identity a failed or skipped item carries out to the diff --git a/internal/agent/fleet_failure_test.go b/internal/runtime/agent/fleet_failure_test.go similarity index 98% rename from internal/agent/fleet_failure_test.go rename to internal/runtime/agent/fleet_failure_test.go index a1ea516468..8799a85194 100644 --- a/internal/agent/fleet_failure_test.go +++ b/internal/runtime/agent/fleet_failure_test.go @@ -9,10 +9,10 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestClassifyFleetFailureReadsIdentityNeverText(t *testing.T) { diff --git a/internal/agent/fleet_graph.go b/internal/runtime/agent/fleet_graph.go similarity index 99% rename from internal/agent/fleet_graph.go rename to internal/runtime/agent/fleet_graph.go index 628df3c97c..a8c7bd077e 100644 --- a/internal/agent/fleet_graph.go +++ b/internal/runtime/agent/fleet_graph.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "reasonix/internal/agentgraph" + "reasonix/internal/contract/agentgraph" ) // fleetPlan is the validated dependency graph for one fleet call. Dependencies diff --git a/internal/agent/fleet_graph_test.go b/internal/runtime/agent/fleet_graph_test.go similarity index 97% rename from internal/agent/fleet_graph_test.go rename to internal/runtime/agent/fleet_graph_test.go index 06b2a4fe9f..0426d7a2f9 100644 --- a/internal/agent/fleet_graph_test.go +++ b/internal/runtime/agent/fleet_graph_test.go @@ -8,12 +8,12 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" - "reasonix/internal/agentgraph" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/agentgraph" ) func planFor(t *testing.T, items ...fleetTaskItem) (fleetPlan, error) { diff --git a/internal/agent/fleet_test.go b/internal/runtime/agent/fleet_test.go similarity index 98% rename from internal/agent/fleet_test.go rename to internal/runtime/agent/fleet_test.go index 7105cf0e89..a456dbe989 100644 --- a/internal/agent/fleet_test.go +++ b/internal/runtime/agent/fleet_test.go @@ -11,14 +11,14 @@ import ( "testing" "time" - "reasonix/internal/checkpoint" - "reasonix/internal/event" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/jobs" + "reasonix/internal/state/checkpoint" - "reasonix/internal/agentgraph" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/agentgraph" ) func TestBackgroundFleetRegistersEveryWriterUntilCompletion(t *testing.T) { diff --git a/internal/agent/fold_boundary.go b/internal/runtime/agent/fold_boundary.go similarity index 100% rename from internal/agent/fold_boundary.go rename to internal/runtime/agent/fold_boundary.go diff --git a/internal/agent/fold_boundary_test.go b/internal/runtime/agent/fold_boundary_test.go similarity index 100% rename from internal/agent/fold_boundary_test.go rename to internal/runtime/agent/fold_boundary_test.go diff --git a/internal/agent/format.go b/internal/runtime/agent/format.go similarity index 97% rename from internal/agent/format.go rename to internal/runtime/agent/format.go index c1b585fbea..184dc2d6ef 100644 --- a/internal/agent/format.go +++ b/internal/runtime/agent/format.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // responseFormatContextKey carries a per-turn structured-output request diff --git a/internal/agent/format_test.go b/internal/runtime/agent/format_test.go similarity index 100% rename from internal/agent/format_test.go rename to internal/runtime/agent/format_test.go diff --git a/internal/agent/gate_test.go b/internal/runtime/agent/gate_test.go similarity index 95% rename from internal/agent/gate_test.go rename to internal/runtime/agent/gate_test.go index 36f0b16635..d8ed66a6ca 100644 --- a/internal/agent/gate_test.go +++ b/internal/runtime/agent/gate_test.go @@ -3,12 +3,12 @@ package agent import ( "context" "encoding/json" - "reasonix/internal/event" + "reasonix/internal/contract/event" "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // stubGate denies any call whose tool name is in deny; everything else allows. diff --git a/internal/agent/goal_boundaries_test.go b/internal/runtime/agent/goal_boundaries_test.go similarity index 90% rename from internal/agent/goal_boundaries_test.go rename to internal/runtime/agent/goal_boundaries_test.go index ab26011e5b..4e74cd1bbb 100644 --- a/internal/agent/goal_boundaries_test.go +++ b/internal/runtime/agent/goal_boundaries_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" ) func TestGoalRunHasNoDefaultModelRoundCeiling(t *testing.T) { diff --git a/internal/agent/goal_display.go b/internal/runtime/agent/goal_display.go similarity index 100% rename from internal/agent/goal_display.go rename to internal/runtime/agent/goal_display.go diff --git a/internal/agent/goal_display_test.go b/internal/runtime/agent/goal_display_test.go similarity index 100% rename from internal/agent/goal_display_test.go rename to internal/runtime/agent/goal_display_test.go diff --git a/internal/agent/goal_recorder_isolation_test.go b/internal/runtime/agent/goal_recorder_isolation_test.go similarity index 97% rename from internal/agent/goal_recorder_isolation_test.go rename to internal/runtime/agent/goal_recorder_isolation_test.go index 5c59c0e792..aa6ac6eefe 100644 --- a/internal/agent/goal_recorder_isolation_test.go +++ b/internal/runtime/agent/goal_recorder_isolation_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type childIsolationGoalRecorder struct { diff --git a/internal/agent/goal_run_boundary.go b/internal/runtime/agent/goal_run_boundary.go similarity index 97% rename from internal/agent/goal_run_boundary.go rename to internal/runtime/agent/goal_run_boundary.go index 60c6d9dc43..9b8836faeb 100644 --- a/internal/agent/goal_run_boundary.go +++ b/internal/runtime/agent/goal_run_boundary.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // maxStepsPause is a resumable stop after a positive model-round budget. diff --git a/internal/agent/graph_lone.go b/internal/runtime/agent/graph_lone.go similarity index 96% rename from internal/agent/graph_lone.go rename to internal/runtime/agent/graph_lone.go index 9cf0ad1fe6..863824371e 100644 --- a/internal/agent/graph_lone.go +++ b/internal/runtime/agent/graph_lone.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "reasonix/internal/agentgraph" - "reasonix/internal/event" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" ) type declaredGraphNodeKey struct{} diff --git a/internal/agent/graph_lone_test.go b/internal/runtime/agent/graph_lone_test.go similarity index 95% rename from internal/agent/graph_lone_test.go rename to internal/runtime/agent/graph_lone_test.go index b0cbe79a34..972bd0d03b 100644 --- a/internal/agent/graph_lone_test.go +++ b/internal/runtime/agent/graph_lone_test.go @@ -5,11 +5,11 @@ import ( "slices" "testing" - "reasonix/internal/agentgraph" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func graphOf(t *testing.T, run func(ctx context.Context, sink event.Sink)) agentgraph.Graph { diff --git a/internal/agent/graph_publish.go b/internal/runtime/agent/graph_publish.go similarity index 99% rename from internal/agent/graph_publish.go rename to internal/runtime/agent/graph_publish.go index 2a4b53c8b6..7645ec2f7f 100644 --- a/internal/agent/graph_publish.go +++ b/internal/runtime/agent/graph_publish.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/event" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" ) // graphErrBudget bounds the failure text a node carries. A graph is drawn, not diff --git a/internal/agent/graph_publish_test.go b/internal/runtime/agent/graph_publish_test.go similarity index 99% rename from internal/agent/graph_publish_test.go rename to internal/runtime/agent/graph_publish_test.go index 8498cfc8e3..8e205576c4 100644 --- a/internal/agent/graph_publish_test.go +++ b/internal/runtime/agent/graph_publish_test.go @@ -6,11 +6,11 @@ import ( "slices" "testing" - "reasonix/internal/ablation" - "reasonix/internal/agentgraph" - "reasonix/internal/event" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) // foldGraph replays the published deltas the way every consumer does, so these diff --git a/internal/agent/guards_test.go b/internal/runtime/agent/guards_test.go similarity index 99% rename from internal/agent/guards_test.go rename to internal/runtime/agent/guards_test.go index 0aad997c96..9bb1044f9f 100644 --- a/internal/agent/guards_test.go +++ b/internal/runtime/agent/guards_test.go @@ -12,10 +12,10 @@ import ( "time" "unicode/utf8" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" - _ "reasonix/internal/tool/builtin" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + _ "reasonix/internal/tools/builtin" ) // TestTruncateToolOutputUnderCap leaves small payloads alone — the cap should diff --git a/internal/agent/hooks_test.go b/internal/runtime/agent/hooks_test.go similarity index 97% rename from internal/agent/hooks_test.go rename to internal/runtime/agent/hooks_test.go index f68a1c37d6..9c72e372f8 100644 --- a/internal/agent/hooks_test.go +++ b/internal/runtime/agent/hooks_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/hook" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/hook" ) // okTool always succeeds; failTool always fails the same way. Together they diff --git a/internal/agent/host_context.go b/internal/runtime/agent/host_context.go similarity index 96% rename from internal/agent/host_context.go rename to internal/runtime/agent/host_context.go index 4290fa113c..2bedd9abae 100644 --- a/internal/agent/host_context.go +++ b/internal/runtime/agent/host_context.go @@ -3,7 +3,7 @@ package agent import ( "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // HostContext supplies facts the host owes the request being built and keeps diff --git a/internal/agent/host_context_test.go b/internal/runtime/agent/host_context_test.go similarity index 87% rename from internal/agent/host_context_test.go rename to internal/runtime/agent/host_context_test.go index 2f0b57e389..9fad756b1b 100644 --- a/internal/agent/host_context_test.go +++ b/internal/runtime/agent/host_context_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type fixedHostContext []string diff --git a/internal/agent/host_stream_track.go b/internal/runtime/agent/host_stream_track.go similarity index 93% rename from internal/agent/host_stream_track.go rename to internal/runtime/agent/host_stream_track.go index 812a4d215d..651c3821f9 100644 --- a/internal/agent/host_stream_track.go +++ b/internal/runtime/agent/host_stream_track.go @@ -3,7 +3,7 @@ package agent import ( "context" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) // trackPublishedHostStream binds cancel to the context's runtime owner so a diff --git a/internal/agent/host_stream_track_test.go b/internal/runtime/agent/host_stream_track_test.go similarity index 95% rename from internal/agent/host_stream_track_test.go rename to internal/runtime/agent/host_stream_track_test.go index d75830ffc8..018d1e58a2 100644 --- a/internal/agent/host_stream_track_test.go +++ b/internal/runtime/agent/host_stream_track_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/extension" + "reasonix/internal/ext/extension" ) func TestTrackPublishedHostStreamUsesContextOwner(t *testing.T) { diff --git a/internal/agent/interrupted_recovery.go b/internal/runtime/agent/interrupted_recovery.go similarity index 99% rename from internal/agent/interrupted_recovery.go rename to internal/runtime/agent/interrupted_recovery.go index 0bcb7cb1c1..3094fc5cdb 100644 --- a/internal/agent/interrupted_recovery.go +++ b/internal/runtime/agent/interrupted_recovery.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) const interruptedRecoveryTag = "interrupted-turn-recovery" diff --git a/internal/agent/keep_failure_test.go b/internal/runtime/agent/keep_failure_test.go similarity index 97% rename from internal/agent/keep_failure_test.go rename to internal/runtime/agent/keep_failure_test.go index 7e567ed1c7..4228211446 100644 --- a/internal/agent/keep_failure_test.go +++ b/internal/runtime/agent/keep_failure_test.go @@ -3,8 +3,8 @@ package agent import ( "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A failing `go test` is the case prefix matching cannot see: the output opens diff --git a/internal/agent/kept_projection.go b/internal/runtime/agent/kept_projection.go similarity index 99% rename from internal/agent/kept_projection.go rename to internal/runtime/agent/kept_projection.go index e8b8404634..780d39b99d 100644 --- a/internal/agent/kept_projection.go +++ b/internal/runtime/agent/kept_projection.go @@ -4,7 +4,7 @@ import ( "slices" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // keptForProjection is the form a verbatim-retained message takes in the diff --git a/internal/agent/kept_projection_test.go b/internal/runtime/agent/kept_projection_test.go similarity index 99% rename from internal/agent/kept_projection_test.go rename to internal/runtime/agent/kept_projection_test.go index fed89368fc..573801aa12 100644 --- a/internal/agent/kept_projection_test.go +++ b/internal/runtime/agent/kept_projection_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) const testGoalBlock = "\nship the parser\n\nGoal mode: pursue this goal autonomously.\n" diff --git a/internal/agent/lineage_key_test.go b/internal/runtime/agent/lineage_key_test.go similarity index 96% rename from internal/agent/lineage_key_test.go rename to internal/runtime/agent/lineage_key_test.go index 0d8cd3e76f..1fa30f91d5 100644 --- a/internal/agent/lineage_key_test.go +++ b/internal/runtime/agent/lineage_key_test.go @@ -3,7 +3,7 @@ package agent import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestLineageKeyCompatibleNativeSuffix(t *testing.T) { diff --git a/internal/agent/listsessions_bench_test.go b/internal/runtime/agent/listsessions_bench_test.go similarity index 95% rename from internal/agent/listsessions_bench_test.go rename to internal/runtime/agent/listsessions_bench_test.go index aaf4049b33..0bfb27ad34 100644 --- a/internal/agent/listsessions_bench_test.go +++ b/internal/runtime/agent/listsessions_bench_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) // TestListSessionsScalingManual reproduces the sidebar "project list loads @@ -19,7 +19,7 @@ import ( // directory. It is gated behind REASONIX_BENCH=1 so it never runs (or writes // hundreds of MB) during a normal `go test`. // -// REASONIX_BENCH=1 go test ./internal/agent -run TestListSessionsScalingManual -v +// REASONIX_BENCH=1 go test ./internal/runtime/agent -run TestListSessionsScalingManual -v func TestListSessionsScalingManual(t *testing.T) { if os.Getenv("REASONIX_BENCH") != "1" { t.Skip("set REASONIX_BENCH=1 to run the scaling benchmark") @@ -125,7 +125,7 @@ func writeSyntheticSessions(t *testing.T, dir string, n, turns int) int64 { // is to confirm the disk cache is now redundant — sidecar-only listing of the // whole tree is already in the low-millisecond range on cold start. // -// REASONIX_BENCH=1 go test ./internal/agent -run TestColdStartProjectTreeManual -v +// REASONIX_BENCH=1 go test ./internal/runtime/agent -run TestColdStartProjectTreeManual -v func TestColdStartProjectTreeManual(t *testing.T) { if os.Getenv("REASONIX_BENCH") != "1" { t.Skip("set REASONIX_BENCH=1 to run the cold-start benchmark") diff --git a/internal/agent/listsessions_sidecar_test.go b/internal/runtime/agent/listsessions_sidecar_test.go similarity index 99% rename from internal/agent/listsessions_sidecar_test.go rename to internal/runtime/agent/listsessions_sidecar_test.go index d7c9c5118b..51d0192846 100644 --- a/internal/agent/listsessions_sidecar_test.go +++ b/internal/runtime/agent/listsessions_sidecar_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) func writeSessionFile(t *testing.T, path string, msgs []provider.Message) { diff --git a/internal/agent/live_contract_test.go b/internal/runtime/agent/live_contract_test.go similarity index 86% rename from internal/agent/live_contract_test.go rename to internal/runtime/agent/live_contract_test.go index a1ba27e6b6..34a27b6f71 100644 --- a/internal/agent/live_contract_test.go +++ b/internal/runtime/agent/live_contract_test.go @@ -3,10 +3,10 @@ package agent import ( "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/taskcontract" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func liveContractAgent(t *testing.T, sink event.Sink) *Agent { @@ -35,7 +35,7 @@ func TestLiveContractReflectsEvidenceAsItLands(t *testing.T) { } a.task.ledger.Record(evidence.Receipt{ - ToolName: "bash", Command: "go test ./internal/provider/", Success: true, + ToolName: "bash", Command: "go test ./internal/contract/provider/", Success: true, }) after := a.LiveContract() satisfied := 0 @@ -53,8 +53,8 @@ func TestLiveContractReflectsEvidenceAsItLands(t *testing.T) { // never disagree about the same receipts. func TestLiveContractMatchesTheEndOfTurnReplay(t *testing.T) { a := liveContractAgent(t, event.Discard) - a.task.ledger.Record(evidence.Receipt{ToolName: "edit_file", Mutation: true, Write: true, Success: true, Paths: []string{"internal/provider/cache.go"}}) - a.task.ledger.Record(evidence.Receipt{ToolName: "bash", Command: "go test ./internal/provider/", Success: true}) + a.task.ledger.Record(evidence.Receipt{ToolName: "edit_file", Mutation: true, Write: true, Success: true, Paths: []string{"internal/contract/provider/cache.go"}}) + a.task.ledger.Record(evidence.Receipt{ToolName: "bash", Command: "go test ./internal/contract/provider/", Success: true}) live := contractShadowAudit(a.LiveContract()) replay := contractShadowAudit(buildShadowContract(a.turn.turnInput, a.task.ledger.Receipts(), a.planContractSnapshot())) diff --git a/internal/agent/live_deepseek_recovery_test.go b/internal/runtime/agent/live_deepseek_recovery_test.go similarity index 98% rename from internal/agent/live_deepseek_recovery_test.go rename to internal/runtime/agent/live_deepseek_recovery_test.go index 3b4dacfc21..a9a727bbc9 100644 --- a/internal/agent/live_deepseek_recovery_test.go +++ b/internal/runtime/agent/live_deepseek_recovery_test.go @@ -17,11 +17,11 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/model/openai" ) // TestLiveDeepSeekFlashMissingReasoningRecovery exercises the production agent diff --git a/internal/agent/live_goal_boundary_test.go b/internal/runtime/agent/live_goal_boundary_test.go similarity index 98% rename from internal/agent/live_goal_boundary_test.go rename to internal/runtime/agent/live_goal_boundary_test.go index 38dd30634b..7b714c727d 100644 --- a/internal/agent/live_goal_boundary_test.go +++ b/internal/runtime/agent/live_goal_boundary_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/model/openai" ) // TestLiveGoalBoundaryMatrix runs the three acceptance scenarios from the Goal diff --git a/internal/agent/loop_e2e_test.go b/internal/runtime/agent/loop_e2e_test.go similarity index 99% rename from internal/agent/loop_e2e_test.go rename to internal/runtime/agent/loop_e2e_test.go index e2000552a2..f90f1d1586 100644 --- a/internal/agent/loop_e2e_test.go +++ b/internal/runtime/agent/loop_e2e_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" ) type toolCallReasoningRequiredProvider struct { diff --git a/internal/agent/main_test.go b/internal/runtime/agent/main_test.go similarity index 100% rename from internal/agent/main_test.go rename to internal/runtime/agent/main_test.go diff --git a/internal/agent/mcp_concurrency.go b/internal/runtime/agent/mcp_concurrency.go similarity index 98% rename from internal/agent/mcp_concurrency.go rename to internal/runtime/agent/mcp_concurrency.go index 648daafa8b..9fbaefb9f0 100644 --- a/internal/agent/mcp_concurrency.go +++ b/internal/runtime/agent/mcp_concurrency.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // MCP concurrency policies. A server is parallel unless something says diff --git a/internal/agent/mcp_concurrency_test.go b/internal/runtime/agent/mcp_concurrency_test.go similarity index 99% rename from internal/agent/mcp_concurrency_test.go rename to internal/runtime/agent/mcp_concurrency_test.go index e3104807c9..9ecc638e4b 100644 --- a/internal/agent/mcp_concurrency_test.go +++ b/internal/runtime/agent/mcp_concurrency_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) func TestMCPServerPolicyDefaultsToParallelExceptKnownStateful(t *testing.T) { diff --git a/internal/agent/mcp_lifetime_test.go b/internal/runtime/agent/mcp_lifetime_test.go similarity index 95% rename from internal/agent/mcp_lifetime_test.go rename to internal/runtime/agent/mcp_lifetime_test.go index f298b4a234..bb6de2b2e5 100644 --- a/internal/agent/mcp_lifetime_test.go +++ b/internal/runtime/agent/mcp_lifetime_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "reasonix/internal/plugin" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" ) // serve builds a controller from r.Context() on a workspace switch, a model diff --git a/internal/agent/mcp_shared_state.go b/internal/runtime/agent/mcp_shared_state.go similarity index 97% rename from internal/agent/mcp_shared_state.go rename to internal/runtime/agent/mcp_shared_state.go index ea0ed466ec..6daa715b22 100644 --- a/internal/agent/mcp_shared_state.go +++ b/internal/runtime/agent/mcp_shared_state.go @@ -3,7 +3,7 @@ package agent import ( "strings" - "reasonix/internal/plugin" + "reasonix/internal/ext/plugin" ) // The live-connection view every frontend on one session observes. It is diff --git a/internal/agent/migrate.go b/internal/runtime/agent/migrate.go similarity index 99% rename from internal/agent/migrate.go rename to internal/runtime/agent/migrate.go index ff5dbbfd3d..63315c0581 100644 --- a/internal/agent/migrate.go +++ b/internal/runtime/agent/migrate.go @@ -11,9 +11,9 @@ import ( "strings" "time" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/provider" - "reasonix/internal/store" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // legacyEvent is the subset of the v0.x typed event stream (.events.jsonl) diff --git a/internal/agent/migrate_native.go b/internal/runtime/agent/migrate_native.go similarity index 98% rename from internal/agent/migrate_native.go rename to internal/runtime/agent/migrate_native.go index 618dcb0e33..9fef8b836d 100644 --- a/internal/agent/migrate_native.go +++ b/internal/runtime/agent/migrate_native.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "reasonix/internal/store" + "reasonix/internal/state/store" ) // moveFlatImport re-homes a session left in the global directory by a flat diff --git a/internal/agent/migrate_native_test.go b/internal/runtime/agent/migrate_native_test.go similarity index 95% rename from internal/agent/migrate_native_test.go rename to internal/runtime/agent/migrate_native_test.go index f2262886df..bb5bd10f9c 100644 --- a/internal/agent/migrate_native_test.go +++ b/internal/runtime/agent/migrate_native_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) func TestMigrateLegacySessionsRehomesNativeWALAheadOfCheckpoint(t *testing.T) { diff --git a/internal/agent/migrate_test.go b/internal/runtime/agent/migrate_test.go similarity index 99% rename from internal/agent/migrate_test.go rename to internal/runtime/agent/migrate_test.go index de5e175284..610850678b 100644 --- a/internal/agent/migrate_test.go +++ b/internal/runtime/agent/migrate_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) const legacyEventLog = `{"type":"model.turn.started","id":1,"ts":"t","turn":0,"model":"deepseek"} diff --git a/internal/agent/missing_reasoning_watch.go b/internal/runtime/agent/missing_reasoning_watch.go similarity index 98% rename from internal/agent/missing_reasoning_watch.go rename to internal/runtime/agent/missing_reasoning_watch.go index 6b97a31ade..2a021adff4 100644 --- a/internal/agent/missing_reasoning_watch.go +++ b/internal/runtime/agent/missing_reasoning_watch.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // missingReasoningWatch is this conversation's live view of one incident. Only diff --git a/internal/agent/missing_reasoning_watch_test.go b/internal/runtime/agent/missing_reasoning_watch_test.go similarity index 88% rename from internal/agent/missing_reasoning_watch_test.go rename to internal/runtime/agent/missing_reasoning_watch_test.go index 217c79d92f..c45660d514 100644 --- a/internal/agent/missing_reasoning_watch_test.go +++ b/internal/runtime/agent/missing_reasoning_watch_test.go @@ -3,10 +3,10 @@ package agent import ( "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent/testutil" ) // billedThinkingTokens stands in for a provider that charged for thinking whose diff --git a/internal/agent/nested_sink.go b/internal/runtime/agent/nested_sink.go similarity index 98% rename from internal/agent/nested_sink.go rename to internal/runtime/agent/nested_sink.go index 254f12cfd5..863ee630b7 100644 --- a/internal/agent/nested_sink.go +++ b/internal/runtime/agent/nested_sink.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // nestedSink is the event view a fleet or parallel_tasks item runs under: tool diff --git a/internal/agent/nested_sink_double_test.go b/internal/runtime/agent/nested_sink_double_test.go similarity index 97% rename from internal/agent/nested_sink_double_test.go rename to internal/runtime/agent/nested_sink_double_test.go index b03d92c8da..1d31e32f90 100644 --- a/internal/agent/nested_sink_double_test.go +++ b/internal/runtime/agent/nested_sink_double_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) type idCapture struct{ ids []string } diff --git a/internal/agent/nil_boundary_test.go b/internal/runtime/agent/nil_boundary_test.go similarity index 96% rename from internal/agent/nil_boundary_test.go rename to internal/runtime/agent/nil_boundary_test.go index a34503e2f8..f7a67a46a7 100644 --- a/internal/agent/nil_boundary_test.go +++ b/internal/runtime/agent/nil_boundary_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - "reasonix/internal/event" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) type typedNilAgentSink struct{} diff --git a/internal/agent/noop_reachability_test.go b/internal/runtime/agent/noop_reachability_test.go similarity index 97% rename from internal/agent/noop_reachability_test.go rename to internal/runtime/agent/noop_reachability_test.go index b74c1191fb..2796ef5afa 100644 --- a/internal/agent/noop_reachability_test.go +++ b/internal/runtime/agent/noop_reachability_test.go @@ -8,11 +8,11 @@ import ( "encoding/json" - "reasonix/internal/extension" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/protocol" ) // unwitnessedNoopVerdicts are the verdicts this file states but does not reach, diff --git a/internal/agent/normalize.go b/internal/runtime/agent/normalize.go similarity index 96% rename from internal/agent/normalize.go rename to internal/runtime/agent/normalize.go index fe0e5c64eb..e0d7363588 100644 --- a/internal/agent/normalize.go +++ b/internal/runtime/agent/normalize.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // NormalizeSession runs the persisted-history-safe repairs on a loaded // conversation and is the agent-side entry point for making old, partially diff --git a/internal/agent/obligation_notice.go b/internal/runtime/agent/obligation_notice.go similarity index 97% rename from internal/agent/obligation_notice.go rename to internal/runtime/agent/obligation_notice.go index 4ad696b639..03104c86b2 100644 --- a/internal/agent/obligation_notice.go +++ b/internal/runtime/agent/obligation_notice.go @@ -7,7 +7,7 @@ package agent import ( "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // withObligationDelta appends what this call did to the host's debts. A call diff --git a/internal/agent/ondemandconnect.go b/internal/runtime/agent/ondemandconnect.go similarity index 98% rename from internal/agent/ondemandconnect.go rename to internal/runtime/agent/ondemandconnect.go index ffc0767dbc..71f8b9c6b1 100644 --- a/internal/agent/ondemandconnect.go +++ b/internal/runtime/agent/ondemandconnect.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "reasonix/internal/plugin" + "reasonix/internal/ext/plugin" ) // onDemandMCPConnect is the deferred first-discovery target: it connects the diff --git a/internal/agent/orphan_outputs.go b/internal/runtime/agent/orphan_outputs.go similarity index 98% rename from internal/agent/orphan_outputs.go rename to internal/runtime/agent/orphan_outputs.go index aa857cdd12..7b207a5c04 100644 --- a/internal/agent/orphan_outputs.go +++ b/internal/runtime/agent/orphan_outputs.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "reasonix/internal/store" + "reasonix/internal/state/store" ) // A spill directory outlived its transcript only by accident: while deleters diff --git a/internal/agent/orphan_outputs_test.go b/internal/runtime/agent/orphan_outputs_test.go similarity index 96% rename from internal/agent/orphan_outputs_test.go rename to internal/runtime/agent/orphan_outputs_test.go index 9901dbd006..fb5fcdb28f 100644 --- a/internal/agent/orphan_outputs_test.go +++ b/internal/runtime/agent/orphan_outputs_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/store" ) // The sweep exists for spill directories every deleter skipped, so it must take diff --git a/internal/agent/outcome_shadow.go b/internal/runtime/agent/outcome_shadow.go similarity index 97% rename from internal/agent/outcome_shadow.go rename to internal/runtime/agent/outcome_shadow.go index 78117112df..b2e5b00d92 100644 --- a/internal/agent/outcome_shadow.go +++ b/internal/runtime/agent/outcome_shadow.go @@ -3,8 +3,8 @@ package agent import ( "fmt" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) // stallNoticeAge is when a check that will not move becomes worth saying out diff --git a/internal/agent/outcome_shadow_test.go b/internal/runtime/agent/outcome_shadow_test.go similarity index 97% rename from internal/agent/outcome_shadow_test.go rename to internal/runtime/agent/outcome_shadow_test.go index 1b170efd3b..a2e13cfa84 100644 --- a/internal/agent/outcome_shadow_test.go +++ b/internal/runtime/agent/outcome_shadow_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) // Measuring the stall is worth nothing unless it reaches a person, and it has diff --git a/internal/agent/outcome_test.go b/internal/runtime/agent/outcome_test.go similarity index 97% rename from internal/agent/outcome_test.go rename to internal/runtime/agent/outcome_test.go index 79fad73b88..9e7c8991c3 100644 --- a/internal/agent/outcome_test.go +++ b/internal/runtime/agent/outcome_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type mcpAliasTool struct { diff --git a/internal/agent/output_budget.go b/internal/runtime/agent/output_budget.go similarity index 99% rename from internal/agent/output_budget.go rename to internal/runtime/agent/output_budget.go index 8a256e70fe..d22502fc4c 100644 --- a/internal/agent/output_budget.go +++ b/internal/runtime/agent/output_budget.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "unicode/utf8" - "reasonix/internal/nilutil" - "reasonix/internal/provider" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/provider" ) const outputBudgetReserve = 8 * 1024 diff --git a/internal/agent/output_budget_test.go b/internal/runtime/agent/output_budget_test.go similarity index 99% rename from internal/agent/output_budget_test.go rename to internal/runtime/agent/output_budget_test.go index b70c7feeb9..633697fb23 100644 --- a/internal/agent/output_budget_test.go +++ b/internal/runtime/agent/output_budget_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type sharedWindowTestProvider struct { diff --git a/internal/agent/parallel_tasks.go b/internal/runtime/agent/parallel_tasks.go similarity index 99% rename from internal/agent/parallel_tasks.go rename to internal/runtime/agent/parallel_tasks.go index e02ddb6189..7242f166a0 100644 --- a/internal/agent/parallel_tasks.go +++ b/internal/runtime/agent/parallel_tasks.go @@ -9,9 +9,9 @@ import ( "strings" "sync" - "reasonix/internal/agentgraph" - "reasonix/internal/event" - "reasonix/internal/tool" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) // ParallelTasksTool dispatches multiple read-only sub-agent tasks concurrently diff --git a/internal/agent/parallel_tasks_test.go b/internal/runtime/agent/parallel_tasks_test.go similarity index 99% rename from internal/agent/parallel_tasks_test.go rename to internal/runtime/agent/parallel_tasks_test.go index 7935187d9c..146267c84e 100644 --- a/internal/agent/parallel_tasks_test.go +++ b/internal/runtime/agent/parallel_tasks_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" - "reasonix/internal/workspacelease" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/state/workspacelease" ) func TestParallelTasksToolIsReadOnly(t *testing.T) { diff --git a/internal/agent/path_bound_tools.go b/internal/runtime/agent/path_bound_tools.go similarity index 98% rename from internal/agent/path_bound_tools.go rename to internal/runtime/agent/path_bound_tools.go index a432399f94..8a74de46d8 100644 --- a/internal/agent/path_bound_tools.go +++ b/internal/runtime/agent/path_bound_tools.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/permission" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/permission" + "reasonix/internal/tools/builtin" ) // pathBoundWriter wraps a built-in write tool so each Execute stays inside a diff --git a/internal/agent/path_bound_tools_test.go b/internal/runtime/agent/path_bound_tools_test.go similarity index 98% rename from internal/agent/path_bound_tools_test.go rename to internal/runtime/agent/path_bound_tools_test.go index 17f78d18e4..fcf0d7f8f7 100644 --- a/internal/agent/path_bound_tools_test.go +++ b/internal/runtime/agent/path_bound_tools_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" + "reasonix/internal/tools/builtin" ) func TestBindWritePathsRebindsBashWriteRoots(t *testing.T) { diff --git a/internal/agent/path_effect.go b/internal/runtime/agent/path_effect.go similarity index 98% rename from internal/agent/path_effect.go rename to internal/runtime/agent/path_effect.go index baf5e7ed40..3caa8578b5 100644 --- a/internal/agent/path_effect.go +++ b/internal/runtime/agent/path_effect.go @@ -8,11 +8,11 @@ import ( "slices" "strings" - "reasonix/internal/checkpoint" - "reasonix/internal/diff" - "reasonix/internal/evidence" - "reasonix/internal/fileutil" - "reasonix/internal/tool" + "reasonix/internal/base/diff" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/checkpoint" ) // A command the host cannot decompose statically — `rm x && ls`, a project diff --git a/internal/agent/path_effect_scan_test.go b/internal/runtime/agent/path_effect_scan_test.go similarity index 99% rename from internal/agent/path_effect_scan_test.go rename to internal/runtime/agent/path_effect_scan_test.go index 5078cc0dfb..aa457f2311 100644 --- a/internal/agent/path_effect_scan_test.go +++ b/internal/runtime/agent/path_effect_scan_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) func scanTree(t *testing.T, files int) string { diff --git a/internal/agent/path_effect_test.go b/internal/runtime/agent/path_effect_test.go similarity index 99% rename from internal/agent/path_effect_test.go rename to internal/runtime/agent/path_effect_test.go index 6eebcb29d6..5cfacb8463 100644 --- a/internal/agent/path_effect_test.go +++ b/internal/runtime/agent/path_effect_test.go @@ -8,8 +8,8 @@ import ( "slices" "testing" - "reasonix/internal/evidence" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/evidence" ) func TestObservationNamesWhatAnOpaqueCommandTouched(t *testing.T) { diff --git a/internal/agent/permission_projection_test.go b/internal/runtime/agent/permission_projection_test.go similarity index 93% rename from internal/agent/permission_projection_test.go rename to internal/runtime/agent/permission_projection_test.go index 40d16ad424..a6b3389f7e 100644 --- a/internal/agent/permission_projection_test.go +++ b/internal/runtime/agent/permission_projection_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type argsGate struct{ args json.RawMessage } diff --git a/internal/agent/plan_contract.go b/internal/runtime/agent/plan_contract.go similarity index 97% rename from internal/agent/plan_contract.go rename to internal/runtime/agent/plan_contract.go index 10d36340d4..79e79d976e 100644 --- a/internal/agent/plan_contract.go +++ b/internal/runtime/agent/plan_contract.go @@ -5,9 +5,9 @@ import ( "encoding/json" "path/filepath" - "reasonix/internal/evidence" - "reasonix/internal/plancontract" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/evidence" ) // SetPlanContract records the approved plan this turn executes, or clears it diff --git a/internal/agent/plan_contract_test.go b/internal/runtime/agent/plan_contract_test.go similarity index 91% rename from internal/agent/plan_contract_test.go rename to internal/runtime/agent/plan_contract_test.go index 2d7df4180d..17227c225f 100644 --- a/internal/agent/plan_contract_test.go +++ b/internal/runtime/agent/plan_contract_test.go @@ -5,11 +5,11 @@ import ( "slices" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/plancontract" - "reasonix/internal/provider" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/event" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/evidence" ) func contractPlan() plancontract.Plan { @@ -18,15 +18,15 @@ func contractPlan() plancontract.Plan { Steps: []plancontract.Step{ { ID: "p1", Title: "thread the model ref through", - VerifiedFiles: []string{"internal/provider/cache.go"}, - CandidateFiles: []string{"internal/boot/boot.go"}, + VerifiedFiles: []string{"internal/contract/provider/cache.go"}, + CandidateFiles: []string{"internal/assembly/boot/boot.go"}, Risks: []string{"warm caches invalidate once"}, Acceptance: []plancontract.Criterion{ {Text: "two model refs never share an entry"}, {Text: "existing hits keep hitting", Regression: true}, {Text: "the hit rate is logged", Optional: true}, }, - Verification: []plancontract.Verification{{Command: "go test ./internal/provider/"}}, + Verification: []plancontract.Verification{{Command: "go test ./internal/contract/provider/"}}, }, }, }.Normalize() @@ -58,14 +58,14 @@ func TestPlanFactsSeparatesCriteriaByKind(t *testing.T) { if got, want := facts.AcceptanceCriteria[0].ID, plan.Steps[0].Acceptance[0].ID; got != want { t.Errorf("criterion id = %q, want the plan's %q", got, want) } - if !slices.Equal(facts.Verifications, []string{"go test ./internal/provider/"}) { + if !slices.Equal(facts.Verifications, []string{"go test ./internal/contract/provider/"}) { t.Errorf("verifications = %v", facts.Verifications) } if !facts.Risky { t.Error("a step carrying risks must mark the plan risky") } // Scope is where work is expected, so an inferred path belongs in it. - if !slices.Equal(facts.Touchpoints, []string{"internal/provider/cache.go", "internal/boot/boot.go"}) { + if !slices.Equal(facts.Touchpoints, []string{"internal/contract/provider/cache.go", "internal/assembly/boot/boot.go"}) { t.Errorf("touchpoints = %v", facts.Touchpoints) } } diff --git a/internal/agent/plan_submission.go b/internal/runtime/agent/plan_submission.go similarity index 98% rename from internal/agent/plan_submission.go rename to internal/runtime/agent/plan_submission.go index 7d240d186f..2f5d7cd555 100644 --- a/internal/agent/plan_submission.go +++ b/internal/runtime/agent/plan_submission.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "reasonix/internal/plancontract" + "reasonix/internal/contract/plancontract" ) // PlanSubmission is where submit_plan leaves an accepted plan for the host that diff --git a/internal/agent/plan_transition_diff.go b/internal/runtime/agent/plan_transition_diff.go similarity index 96% rename from internal/agent/plan_transition_diff.go rename to internal/runtime/agent/plan_transition_diff.go index 53f64b9d07..005f3883e0 100644 --- a/internal/agent/plan_transition_diff.go +++ b/internal/runtime/agent/plan_transition_diff.go @@ -1,8 +1,8 @@ package agent import ( - "reasonix/internal/evidence" - "reasonix/internal/plancontract" + "reasonix/internal/contract/plancontract" + "reasonix/internal/runtime/evidence" ) // planTransitionDiff summarises a task-list rewrite by pairing steps on their diff --git a/internal/agent/plan_transition_diff_test.go b/internal/runtime/agent/plan_transition_diff_test.go similarity index 98% rename from internal/agent/plan_transition_diff_test.go rename to internal/runtime/agent/plan_transition_diff_test.go index a993ede16c..a8a6678a47 100644 --- a/internal/agent/plan_transition_diff_test.go +++ b/internal/runtime/agent/plan_transition_diff_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) func todoList(items ...[2]string) []evidence.TodoItem { diff --git a/internal/agent/planmode_gate.go b/internal/runtime/agent/planmode_gate.go similarity index 98% rename from internal/agent/planmode_gate.go rename to internal/runtime/agent/planmode_gate.go index 18a13e2720..adb399a070 100644 --- a/internal/agent/planmode_gate.go +++ b/internal/runtime/agent/planmode_gate.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "reasonix/internal/planmode" - "reasonix/internal/tool" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/tool" ) // The planning phase's admission decisions. planmode owns the rule; this is diff --git a/internal/agent/planmode_test.go b/internal/runtime/agent/planmode_test.go similarity index 99% rename from internal/agent/planmode_test.go rename to internal/runtime/agent/planmode_test.go index 0a7ec6ac3f..870223ad43 100644 --- a/internal/agent/planmode_test.go +++ b/internal/runtime/agent/planmode_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) type planSafeTool struct { diff --git a/internal/agent/planner_registry.go b/internal/runtime/agent/planner_registry.go similarity index 97% rename from internal/agent/planner_registry.go rename to internal/runtime/agent/planner_registry.go index 2b85e37081..9240d11728 100644 --- a/internal/agent/planner_registry.go +++ b/internal/runtime/agent/planner_registry.go @@ -3,7 +3,7 @@ package agent import ( "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // ask is deliberately absent: a planner that needs a user-owned decision asks diff --git a/internal/agent/planner_route.go b/internal/runtime/agent/planner_route.go similarity index 100% rename from internal/agent/planner_route.go rename to internal/runtime/agent/planner_route.go diff --git a/internal/agent/planner_submit_e2e_test.go b/internal/runtime/agent/planner_submit_e2e_test.go similarity index 95% rename from internal/agent/planner_submit_e2e_test.go rename to internal/runtime/agent/planner_submit_e2e_test.go index 14c53d65ea..3664dc2ec3 100644 --- a/internal/agent/planner_submit_e2e_test.go +++ b/internal/runtime/agent/planner_submit_e2e_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type recordingPlanApprover struct { @@ -53,9 +53,9 @@ func submitPlanCoordinator(t *testing.T, planner, exec *mockProvider, sink event const e2ePlanArgs = `{ "objective":"make the cache key model-aware", "steps":[ - {"id":"p1","title":"thread the model ref through","verified_files":["internal/provider/cache.go"]}, + {"id":"p1","title":"thread the model ref through","verified_files":["internal/contract/provider/cache.go"]}, {"id":"s1","parent_id":"p1","title":"extend cacheKey", - "verification":[{"command":"go test ./internal/provider/","expect":"all green"}]} + "verification":[{"command":"go test ./internal/contract/provider/","expect":"all green"}]} ] }` @@ -81,8 +81,8 @@ func TestSubmittedPlanReachesTheExecutorHandoff(t *testing.T) { "**Objective** — make the cache key model-aware", "1. thread the model ref through", " - extend cacheKey", - "verified: internal/provider/cache.go", - "verify: go test ./internal/provider/ — all green", + "verified: internal/contract/provider/cache.go", + "verify: go test ./internal/contract/provider/ — all green", } { if !strings.Contains(handoff, want) { t.Errorf("executor handoff missing %q:\n%s", want, handoff) diff --git a/internal/agent/positional_compression_test.go b/internal/runtime/agent/positional_compression_test.go similarity index 98% rename from internal/agent/positional_compression_test.go rename to internal/runtime/agent/positional_compression_test.go index 982c7a68f7..4b642fdcc6 100644 --- a/internal/agent/positional_compression_test.go +++ b/internal/runtime/agent/positional_compression_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestSummarizeFromPreservesLocalOnlyOutsideModelAndArchive(t *testing.T) { diff --git a/internal/agent/postllmcall_flow_test.go b/internal/runtime/agent/postllmcall_flow_test.go similarity index 98% rename from internal/agent/postllmcall_flow_test.go rename to internal/runtime/agent/postllmcall_flow_test.go index 2bf2a7c15b..377a37b53f 100644 --- a/internal/agent/postllmcall_flow_test.go +++ b/internal/runtime/agent/postllmcall_flow_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func reasoningTurn() [][]provider.Chunk { diff --git a/internal/agent/preflight.go b/internal/runtime/agent/preflight.go similarity index 99% rename from internal/agent/preflight.go rename to internal/runtime/agent/preflight.go index eba46401cf..9998afb93e 100644 --- a/internal/agent/preflight.go +++ b/internal/runtime/agent/preflight.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // ErrCompactionRequired is returned when the prompt exceeds the provider limit diff --git a/internal/agent/preview.go b/internal/runtime/agent/preview.go similarity index 98% rename from internal/agent/preview.go rename to internal/runtime/agent/preview.go index 8b6e3cd489..df8bc46b8c 100644 --- a/internal/agent/preview.go +++ b/internal/runtime/agent/preview.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TransientUserBlockTags names every block the host prepends to a user turn as @@ -302,8 +302,8 @@ func hasLegacyProviderWrapper(content string) bool { // They are persisted with role "user" for provider-contract reasons but are not // user-authored: previews, titles, and user-turn counts must skip them, and the // chat UI never renders them as user bubbles. Keep in sync with the injection -// sites in internal/agent/agent.go, internal/agent/compact.go, and -// internal/control (plan approval, goal loop). +// sites in internal/runtime/agent/agent.go, internal/runtime/agent/compact.go, and +// internal/session/control (plan approval, goal loop). var SyntheticUserPrefixes = []string{ "", "Plan approved — plan mode is off", diff --git a/internal/agent/preview_prose_test.go b/internal/runtime/agent/preview_prose_test.go similarity index 100% rename from internal/agent/preview_prose_test.go rename to internal/runtime/agent/preview_prose_test.go diff --git a/internal/agent/preview_test.go b/internal/runtime/agent/preview_test.go similarity index 99% rename from internal/agent/preview_test.go rename to internal/runtime/agent/preview_test.go index 8c0febea56..090a29ee06 100644 --- a/internal/agent/preview_test.go +++ b/internal/runtime/agent/preview_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // realContract mirrors the shape compileExecutionContract emits: the diff --git a/internal/agent/producer_sink.go b/internal/runtime/agent/producer_sink.go similarity index 96% rename from internal/agent/producer_sink.go rename to internal/runtime/agent/producer_sink.go index 38e6a7a591..046b3a1bca 100644 --- a/internal/agent/producer_sink.go +++ b/internal/runtime/agent/producer_sink.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/event" +import "reasonix/internal/contract/event" // producerSink names the model that produced each frame an agent emits. A // two-model turn puts two producers on one stream, and the only other way to diff --git a/internal/agent/profile_boundary_test.go b/internal/runtime/agent/profile_boundary_test.go similarity index 99% rename from internal/agent/profile_boundary_test.go rename to internal/runtime/agent/profile_boundary_test.go index a99f4d6bd4..2877d92eac 100644 --- a/internal/agent/profile_boundary_test.go +++ b/internal/runtime/agent/profile_boundary_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/skill" + "reasonix/internal/ext/skill" ) // The criterion these guards enforce. It is repeated in every failure message diff --git a/internal/agent/profile_spec.go b/internal/runtime/agent/profile_spec.go similarity index 98% rename from internal/agent/profile_spec.go rename to internal/runtime/agent/profile_spec.go index 6b0399f69c..3fc19fb087 100644 --- a/internal/agent/profile_spec.go +++ b/internal/runtime/agent/profile_spec.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "reasonix/internal/agentgraph" - "reasonix/internal/evidence" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/evidence" ) // ProfileDefinition is the delegation-facing narrowing of a stored Skill: what diff --git a/internal/agent/profile_spec_test.go b/internal/runtime/agent/profile_spec_test.go similarity index 99% rename from internal/agent/profile_spec_test.go rename to internal/runtime/agent/profile_spec_test.go index 73db9d78b6..2214d8686c 100644 --- a/internal/agent/profile_spec_test.go +++ b/internal/runtime/agent/profile_spec_test.go @@ -3,7 +3,7 @@ package agent import ( "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func TestIntersectToolLists(t *testing.T) { diff --git a/internal/agent/project_check_probe.go b/internal/runtime/agent/project_check_probe.go similarity index 98% rename from internal/agent/project_check_probe.go rename to internal/runtime/agent/project_check_probe.go index 9098abde85..02b6d96b4b 100644 --- a/internal/agent/project_check_probe.go +++ b/internal/runtime/agent/project_check_probe.go @@ -6,8 +6,8 @@ import ( "slices" "strings" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) // probeProjectChecks compares the gate's project-check derivation against the diff --git a/internal/agent/project_check_probe_test.go b/internal/runtime/agent/project_check_probe_test.go similarity index 96% rename from internal/agent/project_check_probe_test.go rename to internal/runtime/agent/project_check_probe_test.go index ee7506312a..31638069bf 100644 --- a/internal/agent/project_check_probe_test.go +++ b/internal/runtime/agent/project_check_probe_test.go @@ -3,11 +3,11 @@ package agent import ( "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/instruction" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/instruction" ) type projectCheckProbeSink struct { diff --git a/internal/agent/projection.go b/internal/runtime/agent/projection.go similarity index 99% rename from internal/agent/projection.go rename to internal/runtime/agent/projection.go index 49cfcf53d9..7585d6d9dc 100644 --- a/internal/agent/projection.go +++ b/internal/runtime/agent/projection.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "reasonix/internal/fileutil" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // Context-projection schema versions. Readers accept any known version; diff --git a/internal/agent/projection_authority_test.go b/internal/runtime/agent/projection_authority_test.go similarity index 98% rename from internal/agent/projection_authority_test.go rename to internal/runtime/agent/projection_authority_test.go index 62576b5359..d846ac3663 100644 --- a/internal/agent/projection_authority_test.go +++ b/internal/runtime/agent/projection_authority_test.go @@ -3,7 +3,7 @@ package agent import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // storedVersions are transcript-version values a sidecar can carry when a new diff --git a/internal/agent/projection_fastpath_test.go b/internal/runtime/agent/projection_fastpath_test.go similarity index 99% rename from internal/agent/projection_fastpath_test.go rename to internal/runtime/agent/projection_fastpath_test.go index 0f01818ed2..f433c5e720 100644 --- a/internal/agent/projection_fastpath_test.go +++ b/internal/runtime/agent/projection_fastpath_test.go @@ -6,7 +6,7 @@ import ( "slices" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // The turn path answers from a memo when it can and from the canonical diff --git a/internal/agent/projection_fingerprint.go b/internal/runtime/agent/projection_fingerprint.go similarity index 98% rename from internal/agent/projection_fingerprint.go rename to internal/runtime/agent/projection_fingerprint.go index 43930957b2..d8d06a8170 100644 --- a/internal/agent/projection_fingerprint.go +++ b/internal/runtime/agent/projection_fingerprint.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // A projection stays valid only while the canonical prefix it folded is // unchanged, and the check for that fingerprints every message behind the fold. diff --git a/internal/agent/projection_fingerprint_test.go b/internal/runtime/agent/projection_fingerprint_test.go similarity index 100% rename from internal/agent/projection_fingerprint_test.go rename to internal/runtime/agent/projection_fingerprint_test.go diff --git a/internal/agent/projection_test.go b/internal/runtime/agent/projection_test.go similarity index 99% rename from internal/agent/projection_test.go rename to internal/runtime/agent/projection_test.go index 0b2eeaa43e..9f46d5990b 100644 --- a/internal/agent/projection_test.go +++ b/internal/runtime/agent/projection_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestCompactionStateAtomicSaveLoad(t *testing.T) { diff --git a/internal/agent/projection_valid_test.go b/internal/runtime/agent/projection_valid_test.go similarity index 98% rename from internal/agent/projection_valid_test.go rename to internal/runtime/agent/projection_valid_test.go index e17d134ae2..c2eb432431 100644 --- a/internal/agent/projection_valid_test.go +++ b/internal/runtime/agent/projection_valid_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestProjectionValidRejectsEditedPrefix(t *testing.T) { diff --git a/internal/agent/provider_tool.go b/internal/runtime/agent/provider_tool.go similarity index 96% rename from internal/agent/provider_tool.go rename to internal/runtime/agent/provider_tool.go index db5184c4e5..477e1a3bfd 100644 --- a/internal/agent/provider_tool.go +++ b/internal/runtime/agent/provider_tool.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strings" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // What the provider produced on its own side, rather than through the tool loop: diff --git a/internal/agent/provider_tool_test.go b/internal/runtime/agent/provider_tool_test.go similarity index 97% rename from internal/agent/provider_tool_test.go rename to internal/runtime/agent/provider_tool_test.go index 11d21848b0..96b142de4d 100644 --- a/internal/agent/provider_tool_test.go +++ b/internal/runtime/agent/provider_tool_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // searchingProvider replays a turn where the provider ran a search itself: the diff --git a/internal/agent/prune.go b/internal/runtime/agent/prune.go similarity index 97% rename from internal/agent/prune.go rename to internal/runtime/agent/prune.go index eb36bb25e1..ea0cba6c6e 100644 --- a/internal/agent/prune.go +++ b/internal/runtime/agent/prune.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // Tool-result bounding, used for a call's first-visible output and for the diff --git a/internal/agent/prune_test.go b/internal/runtime/agent/prune_test.go similarity index 94% rename from internal/agent/prune_test.go rename to internal/runtime/agent/prune_test.go index 261b3acbee..06c9858c72 100644 --- a/internal/agent/prune_test.go +++ b/internal/runtime/agent/prune_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestMaintenanceUsesSummaryNotPruneAtFoldTrigger(t *testing.T) { diff --git a/internal/agent/readiness_proof_test.go b/internal/runtime/agent/readiness_proof_test.go similarity index 98% rename from internal/agent/readiness_proof_test.go rename to internal/runtime/agent/readiness_proof_test.go index 1988ee3af2..566daa20e4 100644 --- a/internal/agent/readiness_proof_test.go +++ b/internal/runtime/agent/readiness_proof_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "reasonix/internal/evidence" - "reasonix/internal/instruction" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/instruction" ) func reviewReceipt(kind evidence.ReviewKind, execID string, grants ...evidence.ReviewKind) evidence.Receipt { diff --git a/internal/agent/readiness_salvage.go b/internal/runtime/agent/readiness_salvage.go similarity index 98% rename from internal/agent/readiness_salvage.go rename to internal/runtime/agent/readiness_salvage.go index a985ab76c9..995522ab35 100644 --- a/internal/agent/readiness_salvage.go +++ b/internal/runtime/agent/readiness_salvage.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // currentFinalAssistantAnswer returns visible Content from the current turn. diff --git a/internal/agent/readonly_bash.go b/internal/runtime/agent/readonly_bash.go similarity index 97% rename from internal/agent/readonly_bash.go rename to internal/runtime/agent/readonly_bash.go index 1f5cfdc211..50f2dd473a 100644 --- a/internal/agent/readonly_bash.go +++ b/internal/runtime/agent/readonly_bash.go @@ -5,8 +5,8 @@ import ( "encoding/json" "strings" - "reasonix/internal/permission" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/permission" ) type readOnlyBash struct { diff --git a/internal/agent/readonly_bash_block_test.go b/internal/runtime/agent/readonly_bash_block_test.go similarity index 100% rename from internal/agent/readonly_bash_block_test.go rename to internal/runtime/agent/readonly_bash_block_test.go diff --git a/internal/agent/readonly_handoff_test.go b/internal/runtime/agent/readonly_handoff_test.go similarity index 98% rename from internal/agent/readonly_handoff_test.go rename to internal/runtime/agent/readonly_handoff_test.go index e20a563beb..54009e4f25 100644 --- a/internal/agent/readonly_handoff_test.go +++ b/internal/runtime/agent/readonly_handoff_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // A writer child submits a typed claim the host adjudicates. A read-only child diff --git a/internal/agent/readonly_subagent.go b/internal/runtime/agent/readonly_subagent.go similarity index 98% rename from internal/agent/readonly_subagent.go rename to internal/runtime/agent/readonly_subagent.go index 54345921e9..401491a9a3 100644 --- a/internal/agent/readonly_subagent.go +++ b/internal/runtime/agent/readonly_subagent.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // readOnlySubRegistry builds a strict child's tools, proves it can investigate diff --git a/internal/agent/reasoning_language.go b/internal/runtime/agent/reasoning_language.go similarity index 100% rename from internal/agent/reasoning_language.go rename to internal/runtime/agent/reasoning_language.go diff --git a/internal/agent/reasoning_language_test.go b/internal/runtime/agent/reasoning_language_test.go similarity index 96% rename from internal/agent/reasoning_language_test.go rename to internal/runtime/agent/reasoning_language_test.go index f934bfb328..ac0b68757d 100644 --- a/internal/agent/reasoning_language_test.go +++ b/internal/runtime/agent/reasoning_language_test.go @@ -92,7 +92,7 @@ func TestReasoningLanguageWeighsProseNotMentions(t *testing.T) { "看下 run.log 里的 IndexError 是怎么来的", "修复 app.py 的 parse 函数，run.log 里有 Traceback", "这个 bug 怎么修：IndexError: list index out of range in app.py line 2", - "把 internal/agent/agent.go 里的 SetGate 拆出来", + "把 internal/runtime/agent/agent.go 里的 SetGate 拆出来", "为什么 CI 一直红？把 go vet 的输出贴出来看看", "PR #123 修复了什么问题", } @@ -117,7 +117,7 @@ func TestReasoningLanguageWeighsProseNotMentions(t *testing.T) { } func TestCodeTokensCarryNoLanguage(t *testing.T) { - for _, token := range []string{"parser.go", "internal/agent", "run.log", "snake_case", "camelCase", "IndexError", "`inline`", "a/b/c"} { + for _, token := range []string{"parser.go", "internal/runtime/agent", "run.log", "snake_case", "camelCase", "IndexError", "`inline`", "a/b/c"} { if !tokenIsCode(token) { t.Errorf("%q should not vote on the prose language", token) } diff --git a/internal/agent/reasoning_warn_state.go b/internal/runtime/agent/reasoning_warn_state.go similarity index 99% rename from internal/agent/reasoning_warn_state.go rename to internal/runtime/agent/reasoning_warn_state.go index 003a76fdf4..3761aa8c0d 100644 --- a/internal/agent/reasoning_warn_state.go +++ b/internal/runtime/agent/reasoning_warn_state.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "reasonix/internal/filelock" - "reasonix/internal/fileutil" + "reasonix/internal/base/filelock" + "reasonix/internal/base/fileutil" ) const missingReasoningWarnStateFilename = "tool-call-reasoning-warning.json" diff --git a/internal/agent/reasoning_warn_state_test.go b/internal/runtime/agent/reasoning_warn_state_test.go similarity index 99% rename from internal/agent/reasoning_warn_state_test.go rename to internal/runtime/agent/reasoning_warn_state_test.go index 739e05f3c9..a82fac4b6a 100644 --- a/internal/agent/reasoning_warn_state_test.go +++ b/internal/runtime/agent/reasoning_warn_state_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "reasonix/internal/filelock" - "reasonix/internal/testenv" + "reasonix/internal/base/filelock" + "reasonix/internal/base/testenv" ) func warningFingerprint(label string) string { diff --git a/internal/agent/recovery_attribution_test.go b/internal/runtime/agent/recovery_attribution_test.go similarity index 97% rename from internal/agent/recovery_attribution_test.go rename to internal/runtime/agent/recovery_attribution_test.go index 65239a566f..422db3d188 100644 --- a/internal/agent/recovery_attribution_test.go +++ b/internal/runtime/agent/recovery_attribution_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) type recoverySink struct { diff --git a/internal/agent/recovery_gate.go b/internal/runtime/agent/recovery_gate.go similarity index 99% rename from internal/agent/recovery_gate.go rename to internal/runtime/agent/recovery_gate.go index 926de6bb47..5ad463d50d 100644 --- a/internal/agent/recovery_gate.go +++ b/internal/runtime/agent/recovery_gate.go @@ -7,8 +7,8 @@ import ( "strings" "sync/atomic" - "reasonix/internal/evidence" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // recoveryIdentity is who this agent is to the shared gate: the labels a diff --git a/internal/agent/recovery_gate_test.go b/internal/runtime/agent/recovery_gate_test.go similarity index 97% rename from internal/agent/recovery_gate_test.go rename to internal/runtime/agent/recovery_gate_test.go index 0ed097ef02..1b12561578 100644 --- a/internal/agent/recovery_gate_test.go +++ b/internal/runtime/agent/recovery_gate_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) type recordingRecoveryGate struct { diff --git a/internal/agent/recovery_gc.go b/internal/runtime/agent/recovery_gc.go similarity index 99% rename from internal/agent/recovery_gc.go rename to internal/runtime/agent/recovery_gc.go index fe6910a9ba..787b752374 100644 --- a/internal/agent/recovery_gc.go +++ b/internal/runtime/agent/recovery_gc.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "reasonix/internal/fileutil" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + "reasonix/internal/state/store" ) // Recovery-branch garbage collection. Conflict recovery forks a copy of the diff --git a/internal/agent/recovery_gc_test.go b/internal/runtime/agent/recovery_gc_test.go similarity index 99% rename from internal/agent/recovery_gc_test.go rename to internal/runtime/agent/recovery_gc_test.go index 16375a10f0..c7760e435d 100644 --- a/internal/agent/recovery_gc_test.go +++ b/internal/runtime/agent/recovery_gc_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // forkRecoveryBranch builds a real conflict-recovery branch: a diverged disk diff --git a/internal/agent/recovery_isolated.go b/internal/runtime/agent/recovery_isolated.go similarity index 99% rename from internal/agent/recovery_isolated.go rename to internal/runtime/agent/recovery_isolated.go index c11ced8e60..f1a0827d8a 100644 --- a/internal/agent/recovery_isolated.go +++ b/internal/runtime/agent/recovery_isolated.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // ownsWritableBaseline reports whether this session may rewrite path at the diff --git a/internal/agent/recovery_isolated_test.go b/internal/runtime/agent/recovery_isolated_test.go similarity index 98% rename from internal/agent/recovery_isolated_test.go rename to internal/runtime/agent/recovery_isolated_test.go index 694e090509..8c58912715 100644 --- a/internal/agent/recovery_isolated_test.go +++ b/internal/runtime/agent/recovery_isolated_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) func TestSaveConflictRecoveryBranchAtCapStaysBounded(t *testing.T) { diff --git a/internal/agent/recovery_lineage.go b/internal/runtime/agent/recovery_lineage.go similarity index 100% rename from internal/agent/recovery_lineage.go rename to internal/runtime/agent/recovery_lineage.go diff --git a/internal/agent/recovery_lineage_test.go b/internal/runtime/agent/recovery_lineage_test.go similarity index 98% rename from internal/agent/recovery_lineage_test.go rename to internal/runtime/agent/recovery_lineage_test.go index 60b8fce2ef..df182a31b0 100644 --- a/internal/agent/recovery_lineage_test.go +++ b/internal/runtime/agent/recovery_lineage_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) // forkChain builds root ← A ← B ← C: the pile a lane-per-Session build left diff --git a/internal/agent/refusal_identity_live_test.go b/internal/runtime/agent/refusal_identity_live_test.go similarity index 99% rename from internal/agent/refusal_identity_live_test.go rename to internal/runtime/agent/refusal_identity_live_test.go index e97c53497d..22fa4b47c0 100644 --- a/internal/agent/refusal_identity_live_test.go +++ b/internal/runtime/agent/refusal_identity_live_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // refusalArm is one arm of the fork measuring what R1 does not itself diff --git a/internal/agent/refusal_identity_test.go b/internal/runtime/agent/refusal_identity_test.go similarity index 99% rename from internal/agent/refusal_identity_test.go rename to internal/runtime/agent/refusal_identity_test.go index 82b4a62fb0..cc5803cdd5 100644 --- a/internal/agent/refusal_identity_test.go +++ b/internal/runtime/agent/refusal_identity_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // stubRefusingTool is always out of context and refuses with whatever it is diff --git a/internal/agent/render_readiness_test.go b/internal/runtime/agent/render_readiness_test.go similarity index 96% rename from internal/agent/render_readiness_test.go rename to internal/runtime/agent/render_readiness_test.go index 86e9c9b180..434b3b1701 100644 --- a/internal/agent/render_readiness_test.go +++ b/internal/runtime/agent/render_readiness_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/taskpolicy" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/taskpolicy" ) func renderWrite(path string) evidence.Receipt { diff --git a/internal/agent/response_boundary.go b/internal/runtime/agent/response_boundary.go similarity index 99% rename from internal/agent/response_boundary.go rename to internal/runtime/agent/response_boundary.go index 657b9f7b5f..ce483b38b4 100644 --- a/internal/agent/response_boundary.go +++ b/internal/runtime/agent/response_boundary.go @@ -7,7 +7,7 @@ import ( "io" "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // responseBoundary is one sampling terminal classified against the tool calls diff --git a/internal/agent/response_boundary_test.go b/internal/runtime/agent/response_boundary_test.go similarity index 98% rename from internal/agent/response_boundary_test.go rename to internal/runtime/agent/response_boundary_test.go index 475b1c94e6..568c8cc173 100644 --- a/internal/agent/response_boundary_test.go +++ b/internal/runtime/agent/response_boundary_test.go @@ -7,9 +7,9 @@ import ( "sync/atomic" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // schemaTool stands in for a tool whose schema actually declares a required diff --git a/internal/agent/retry_e2e_test.go b/internal/runtime/agent/retry_e2e_test.go similarity index 97% rename from internal/agent/retry_e2e_test.go rename to internal/runtime/agent/retry_e2e_test.go index 2212d54471..c1c0b14a80 100644 --- a/internal/agent/retry_e2e_test.go +++ b/internal/runtime/agent/retry_e2e_test.go @@ -10,10 +10,10 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/model/openai" ) type recordSink struct { diff --git a/internal/agent/revalidate_projection_test.go b/internal/runtime/agent/revalidate_projection_test.go similarity index 95% rename from internal/agent/revalidate_projection_test.go rename to internal/runtime/agent/revalidate_projection_test.go index d2bbef04b5..ac083b20f9 100644 --- a/internal/agent/revalidate_projection_test.go +++ b/internal/runtime/agent/revalidate_projection_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // projectionWithLiveTail returns a compacted agent whose transcript has grown diff --git a/internal/agent/review_authority_test.go b/internal/runtime/agent/review_authority_test.go similarity index 95% rename from internal/agent/review_authority_test.go rename to internal/runtime/agent/review_authority_test.go index 55717c84df..0009db90b8 100644 --- a/internal/agent/review_authority_test.go +++ b/internal/runtime/agent/review_authority_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/agentpreset" - "reasonix/internal/evidence" - "reasonix/internal/taskpolicy" - "reasonix/internal/tool" + "reasonix/internal/contract/agentpreset" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/taskpolicy" ) // reviewLedgerWithRead is a run that has read one file and nothing else, which @@ -26,7 +26,7 @@ func reviewLedgerWithRead(path string) *evidence.Ledger { // about the host's own grant, so a mismatch is refused at the tool rather than // recorded and unpicked by a gate downstream. func TestReviewReportRefusesAKindTheRunWasNotAssigned(t *testing.T) { - const target = "internal/permission/gate.go" + const target = "internal/safety/permission/gate.go" for _, tc := range []struct { granted, submitted evidence.ReviewKind accepted bool @@ -103,8 +103,8 @@ func TestOrdinaryWorkerIsNeverMountedTheReportTool(t *testing.T) { // the only thing that moves is what the host granted the run. A host decision // that changes here is correct: the variable is a host-owned capability. func TestHostGrantIsWhatMovesTheReviewObligation(t *testing.T) { - const target = "internal/permission/gate.go" - const body = `{"kind":%q,"verdict":"pass","reviewed_paths":["internal/permission/gate.go"]}` + const target = "internal/safety/permission/gate.go" + const body = `{"kind":%q,"verdict":"pass","reviewed_paths":["internal/safety/permission/gate.go"]}` gateFor := func(granted evidence.ReviewKind) string { ledger := evidence.NewLedger() @@ -118,7 +118,7 @@ func TestHostGrantIsWhatMovesTheReviewObligation(t *testing.T) { reg.Add(fakeTool{name: "review", readOnly: true}) reg.Add(fakeTool{name: "security_review", readOnly: true}) a := &Agent{deliveryProfile: true, task: taskRuntime{ledger: ledger}, svc: agentServices{tools: reg}} - a.projectSensitivePaths = []string{"internal/permission/**"} + a.projectSensitivePaths = []string{"internal/safety/permission/**"} a.turn.policy = taskpolicy.Derive(taskpolicy.Input{Preset: agentpreset.Delivery}) a.turn.policySet = true return a.reviewGateFailure() @@ -137,7 +137,7 @@ func TestHostGrantIsWhatMovesTheReviewObligation(t *testing.T) { // longer close the security obligation, because it never could — it just used // to be able to say it had. func TestReviewContractedRunCannotCloseTheSecurityObligation(t *testing.T) { - const target = "internal/permission/gate.go" + const target = "internal/safety/permission/gate.go" child := reviewLedgerWithRead(target) ctx := evidence.WithLedger(context.Background(), child) grant := reviewGrant(evidence.ReviewKindReview) @@ -167,7 +167,7 @@ func TestReviewContractedRunCannotCloseTheSecurityObligation(t *testing.T) { reg.Add(fakeTool{name: "review", readOnly: true}) reg.Add(fakeTool{name: "security_review", readOnly: true}) a := &Agent{deliveryProfile: true, task: taskRuntime{ledger: parent}, svc: agentServices{tools: reg}} - a.projectSensitivePaths = []string{"internal/permission/**"} + a.projectSensitivePaths = []string{"internal/safety/permission/**"} a.turn.policy = taskpolicy.Derive(taskpolicy.Input{Preset: agentpreset.Delivery}) a.turn.policySet = true diff --git a/internal/agent/review_grant_testutil_test.go b/internal/runtime/agent/review_grant_testutil_test.go similarity index 95% rename from internal/agent/review_grant_testutil_test.go rename to internal/runtime/agent/review_grant_testutil_test.go index fa3e7153e6..926a21ad7d 100644 --- a/internal/agent/review_grant_testutil_test.go +++ b/internal/runtime/agent/review_grant_testutil_test.go @@ -3,7 +3,7 @@ package agent import ( "encoding/json" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // reviewGrant is the grant a host issues to a worker contracted for one kind: diff --git a/internal/agent/review_report.go b/internal/runtime/agent/review_report.go similarity index 99% rename from internal/agent/review_report.go rename to internal/runtime/agent/review_report.go index 46e572f3dd..ece04d1ccc 100644 --- a/internal/agent/review_report.go +++ b/internal/runtime/agent/review_report.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/evidence" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // ReviewReportGrant is what the host bound one report tool to before its diff --git a/internal/agent/review_unavailable.go b/internal/runtime/agent/review_unavailable.go similarity index 100% rename from internal/agent/review_unavailable.go rename to internal/runtime/agent/review_unavailable.go diff --git a/internal/agent/review_unavailable_test.go b/internal/runtime/agent/review_unavailable_test.go similarity index 93% rename from internal/agent/review_unavailable_test.go rename to internal/runtime/agent/review_unavailable_test.go index 0ec73de2f9..b3917cf98f 100644 --- a/internal/agent/review_unavailable_test.go +++ b/internal/runtime/agent/review_unavailable_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func TestReviewUnavailableErrorIsPartialPath(t *testing.T) { diff --git a/internal/agent/run_budget.go b/internal/runtime/agent/run_budget.go similarity index 98% rename from internal/agent/run_budget.go rename to internal/runtime/agent/run_budget.go index 48490ff8eb..0b93ae5c72 100644 --- a/internal/agent/run_budget.go +++ b/internal/runtime/agent/run_budget.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // TaskBudget bounds one task on the axes its failures are reported in, and diff --git a/internal/agent/run_budget_test.go b/internal/runtime/agent/run_budget_test.go similarity index 98% rename from internal/agent/run_budget_test.go rename to internal/runtime/agent/run_budget_test.go index ca81fe5229..2428c59bda 100644 --- a/internal/agent/run_budget_test.go +++ b/internal/runtime/agent/run_budget_test.go @@ -6,9 +6,9 @@ import ( "sync/atomic" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // budgetSink opts into the shadow axis; an ordinary sink would receive nothing. diff --git a/internal/agent/run_loop.go b/internal/runtime/agent/run_loop.go similarity index 99% rename from internal/agent/run_loop.go rename to internal/runtime/agent/run_loop.go index fd2f0c7203..5f2f30bd73 100644 --- a/internal/agent/run_loop.go +++ b/internal/runtime/agent/run_loop.go @@ -9,14 +9,14 @@ import ( "sync/atomic" "time" - "reasonix/internal/agentpreset" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/jobs" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/taskpolicy" - "reasonix/internal/tool" + "reasonix/internal/contract/agentpreset" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" + "reasonix/internal/runtime/taskpolicy" ) // streamedTurn is one provider completion collected by stream. Keeping the diff --git a/internal/agent/run_usage.go b/internal/runtime/agent/run_usage.go similarity index 99% rename from internal/agent/run_usage.go rename to internal/runtime/agent/run_usage.go index 1a597cab5f..b92b21634b 100644 --- a/internal/agent/run_usage.go +++ b/internal/runtime/agent/run_usage.go @@ -1,8 +1,8 @@ package agent import ( - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // estimateFailedAttemptUsage fills Estimated usage when a body attempt ends diff --git a/internal/agent/runaway_outcome_test.go b/internal/runtime/agent/runaway_outcome_test.go similarity index 90% rename from internal/agent/runaway_outcome_test.go rename to internal/runtime/agent/runaway_outcome_test.go index fc847484fe..d5d4d1a658 100644 --- a/internal/agent/runaway_outcome_test.go +++ b/internal/runtime/agent/runaway_outcome_test.go @@ -7,10 +7,10 @@ import ( "sync/atomic" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) type scriptedTool struct { @@ -94,12 +94,12 @@ func TestOutcomeVersusLegacyOnTheRunawayShape(t *testing.T) { wandering = append(wandering, scriptedCall{"read_file", fmt.Sprintf(`{"path":"internal/pkg%d/file.go"}`, i)}) } realWork := []scriptedCall{ - {"read_file", `{"path":"internal/agent/agent.go"}`}, - {"read_file", `{"path":"internal/agent/run_loop.go"}`}, - {"edit_file", `{"path":"internal/agent/run_loop.go"}`}, - {"bash", `{"command":"go test ./internal/agent/"}`}, - {"edit_file", `{"path":"internal/agent/agent.go"}`}, - {"bash", `{"command":"go test ./internal/agent/"}`}, + {"read_file", `{"path":"internal/runtime/agent/agent.go"}`}, + {"read_file", `{"path":"internal/runtime/agent/run_loop.go"}`}, + {"edit_file", `{"path":"internal/runtime/agent/run_loop.go"}`}, + {"bash", `{"command":"go test ./internal/runtime/agent/"}`}, + {"edit_file", `{"path":"internal/runtime/agent/agent.go"}`}, + {"bash", `{"command":"go test ./internal/runtime/agent/"}`}, } for _, scenario := range []struct { diff --git a/internal/agent/runaway_repro_test.go b/internal/runtime/agent/runaway_repro_test.go similarity index 100% rename from internal/agent/runaway_repro_test.go rename to internal/runtime/agent/runaway_repro_test.go diff --git a/internal/agent/sampling_request.go b/internal/runtime/agent/sampling_request.go similarity index 98% rename from internal/agent/sampling_request.go rename to internal/runtime/agent/sampling_request.go index e7474870a7..a256dd7afd 100644 --- a/internal/agent/sampling_request.go +++ b/internal/runtime/agent/sampling_request.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // samplingRequest is a once-prepared, frozen provider request for one model diff --git a/internal/agent/save.go b/internal/runtime/agent/save.go similarity index 99% rename from internal/agent/save.go rename to internal/runtime/agent/save.go index 06b6f1c540..758928beaa 100644 --- a/internal/agent/save.go +++ b/internal/runtime/agent/save.go @@ -20,11 +20,11 @@ import ( "time" "unicode/utf8" - "reasonix/internal/filelock" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/base/filelock" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) const ( diff --git a/internal/agent/save_bench_test.go b/internal/runtime/agent/save_bench_test.go similarity index 96% rename from internal/agent/save_bench_test.go rename to internal/runtime/agent/save_bench_test.go index e80d568949..71c4064cc8 100644 --- a/internal/agent/save_bench_test.go +++ b/internal/runtime/agent/save_bench_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // One more turn onto an already-saved session of n messages: the shape every diff --git a/internal/agent/save_conflict.go b/internal/runtime/agent/save_conflict.go similarity index 98% rename from internal/agent/save_conflict.go rename to internal/runtime/agent/save_conflict.go index 5c03089313..48e5ceaaa8 100644 --- a/internal/agent/save_conflict.go +++ b/internal/runtime/agent/save_conflict.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) type SessionSnapshotConflictKind string diff --git a/internal/agent/save_external_write_test.go b/internal/runtime/agent/save_external_write_test.go similarity index 98% rename from internal/agent/save_external_write_test.go rename to internal/runtime/agent/save_external_write_test.go index 0191a5cfaf..e79b2b556f 100644 --- a/internal/agent/save_external_write_test.go +++ b/internal/runtime/agent/save_external_write_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // rewriteTranscriptOutsideReasonix replaces what is on disk the way anything diff --git a/internal/agent/save_false_diverged_test.go b/internal/runtime/agent/save_false_diverged_test.go similarity index 99% rename from internal/agent/save_false_diverged_test.go rename to internal/runtime/agent/save_false_diverged_test.go index b13e03cb26..dfd1d3eae1 100644 --- a/internal/agent/save_false_diverged_test.go +++ b/internal/runtime/agent/save_false_diverged_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) func recoveryJSONL(dir string) []string { diff --git a/internal/agent/save_listing_projection.go b/internal/runtime/agent/save_listing_projection.go similarity index 95% rename from internal/agent/save_listing_projection.go rename to internal/runtime/agent/save_listing_projection.go index 8d11111944..ec163550b1 100644 --- a/internal/agent/save_listing_projection.go +++ b/internal/runtime/agent/save_listing_projection.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "log/slog" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func (s *Session) markPersistedWithListing(path string, digest [sha256.Size]byte, version uint64, revision int64, rewriteVersion int, msgs []provider.Message) { diff --git a/internal/agent/save_recovery_fanout_test.go b/internal/runtime/agent/save_recovery_fanout_test.go similarity index 98% rename from internal/agent/save_recovery_fanout_test.go rename to internal/runtime/agent/save_recovery_fanout_test.go index 561a20c6de..f19b260e12 100644 --- a/internal/agent/save_recovery_fanout_test.go +++ b/internal/runtime/agent/save_recovery_fanout_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) // staleSessionOver returns a session holding the parent transcript plus one diff --git a/internal/agent/save_recovery_helpers.go b/internal/runtime/agent/save_recovery_helpers.go similarity index 99% rename from internal/agent/save_recovery_helpers.go rename to internal/runtime/agent/save_recovery_helpers.go index 27f3255a49..10219761cd 100644 --- a/internal/agent/save_recovery_helpers.go +++ b/internal/runtime/agent/save_recovery_helpers.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // writeRecoveryBranchAtPath persists one bounded recovery lane. collision is diff --git a/internal/agent/save_recovery_projection_test.go b/internal/runtime/agent/save_recovery_projection_test.go similarity index 97% rename from internal/agent/save_recovery_projection_test.go rename to internal/runtime/agent/save_recovery_projection_test.go index d0703df64c..d0ff3b4de9 100644 --- a/internal/agent/save_recovery_projection_test.go +++ b/internal/runtime/agent/save_recovery_projection_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) func TestSaveRecoveryBranchInheritsValidProjection(t *testing.T) { diff --git a/internal/agent/save_repair_baseline_test.go b/internal/runtime/agent/save_repair_baseline_test.go similarity index 97% rename from internal/agent/save_repair_baseline_test.go rename to internal/runtime/agent/save_repair_baseline_test.go index 32db4868e5..1cd48facf5 100644 --- a/internal/agent/save_repair_baseline_test.go +++ b/internal/runtime/agent/save_repair_baseline_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) func seedTwoTurnSession(t *testing.T, path string) { diff --git a/internal/agent/save_supersede.go b/internal/runtime/agent/save_supersede.go similarity index 98% rename from internal/agent/save_supersede.go rename to internal/runtime/agent/save_supersede.go index 102fef85de..2060749dd9 100644 --- a/internal/agent/save_supersede.go +++ b/internal/runtime/agent/save_supersede.go @@ -7,7 +7,7 @@ import ( "os" "time" - "reasonix/internal/store" + "reasonix/internal/state/store" ) // supersedingDecision is the write a leaseholder is entitled to over a diff --git a/internal/agent/save_test.go b/internal/runtime/agent/save_test.go similarity index 99% rename from internal/agent/save_test.go rename to internal/runtime/agent/save_test.go index 135945ee56..1ee977f220 100644 --- a/internal/agent/save_test.go +++ b/internal/runtime/agent/save_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // touch sets a file's mtime to t. Used by the listing-order test so it diff --git a/internal/agent/scaling_bench_test.go b/internal/runtime/agent/scaling_bench_test.go similarity index 97% rename from internal/agent/scaling_bench_test.go rename to internal/runtime/agent/scaling_bench_test.go index 816d649e1f..0ea0853da6 100644 --- a/internal/agent/scaling_bench_test.go +++ b/internal/runtime/agent/scaling_bench_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // longSession builds a canonical transcript of n turns already folded behind a diff --git a/internal/agent/scheduler.go b/internal/runtime/agent/scheduler.go similarity index 99% rename from internal/agent/scheduler.go rename to internal/runtime/agent/scheduler.go index 154d208a61..218c16f2cc 100644 --- a/internal/agent/scheduler.go +++ b/internal/runtime/agent/scheduler.go @@ -7,7 +7,7 @@ import ( "slices" "sync" - "reasonix/internal/agentgraph" + "reasonix/internal/contract/agentgraph" ) // SubagentSlotStatus is the queue lifecycle shown for background task/fleet diff --git a/internal/agent/scheduler_test.go b/internal/runtime/agent/scheduler_test.go similarity index 98% rename from internal/agent/scheduler_test.go rename to internal/runtime/agent/scheduler_test.go index b3be817a3a..a17b7f2cc1 100644 --- a/internal/agent/scheduler_test.go +++ b/internal/runtime/agent/scheduler_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/agentgraph" ) func TestSchedulerTotalConcurrencyQueues(t *testing.T) { diff --git a/internal/agent/scope_escape_test.go b/internal/runtime/agent/scope_escape_test.go similarity index 88% rename from internal/agent/scope_escape_test.go rename to internal/runtime/agent/scope_escape_test.go index d58cc268f6..79600e7824 100644 --- a/internal/agent/scope_escape_test.go +++ b/internal/runtime/agent/scope_escape_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "reasonix/internal/plancontract" - "reasonix/internal/tool" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/tool" ) func scopedAgent(t *testing.T, plan *plancontract.Plan) *Agent { @@ -29,7 +29,7 @@ func TestMutationOutsideThePlanEscapes(t *testing.T) { }}}.Normalize() a := scopedAgent(t, &plan) - if a.mutationEscapesPlan("write_file", writeArgs("internal/billing/invoice.go")) != true { + if a.mutationEscapesPlan("write_file", writeArgs("internal/model/billing/invoice.go")) != true { t.Fatal("a write the plan never named must read as leaving the approved scope") } } @@ -55,11 +55,11 @@ func TestMutationBesideAPlannedFileStaysInScope(t *testing.T) { func TestCandidatePathsCountAsScope(t *testing.T) { plan := plancontract.Plan{Objective: "o", Steps: []plancontract.Step{{ Title: "fix it", - CandidateFiles: []string{"internal/boot/boot.go"}, + CandidateFiles: []string{"internal/assembly/boot/boot.go"}, }}}.Normalize() a := scopedAgent(t, &plan) - if a.mutationEscapesPlan("write_file", writeArgs("internal/boot/boot.go")) { + if a.mutationEscapesPlan("write_file", writeArgs("internal/assembly/boot/boot.go")) { t.Fatal("a candidate path is inside the planned surface") } } diff --git a/internal/agent/secret_redaction_test.go b/internal/runtime/agent/secret_redaction_test.go similarity index 93% rename from internal/agent/secret_redaction_test.go rename to internal/runtime/agent/secret_redaction_test.go index be9fbdc677..ad1f44792d 100644 --- a/internal/agent/secret_redaction_test.go +++ b/internal/runtime/agent/secret_redaction_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type secretOutputTool struct{} diff --git a/internal/agent/services.go b/internal/runtime/agent/services.go similarity index 93% rename from internal/agent/services.go rename to internal/runtime/agent/services.go index 3aa2ffb334..ee83eebd52 100644 --- a/internal/agent/services.go +++ b/internal/runtime/agent/services.go @@ -1,16 +1,16 @@ package agent import ( - "reasonix/internal/checkpoint" - "reasonix/internal/diff" - "reasonix/internal/event" - "reasonix/internal/extension/dispatch" - "reasonix/internal/jobs" - "reasonix/internal/memory" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/tool" - "reasonix/internal/workspacelease" + "reasonix/internal/base/diff" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/runtime/jobs" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/checkpoint" + "reasonix/internal/state/memory" + "reasonix/internal/state/workspacelease" ) // agentServices are the collaborators an Agent talks to, separated from the diff --git a/internal/agent/session.go b/internal/runtime/agent/session.go similarity index 99% rename from internal/agent/session.go rename to internal/runtime/agent/session.go index 1736836b48..3bd0a3381b 100644 --- a/internal/agent/session.go +++ b/internal/runtime/agent/session.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // Session holds the conversation history for one task. The run loop (one turn at diff --git a/internal/agent/session_checkpoint_agreement.go b/internal/runtime/agent/session_checkpoint_agreement.go similarity index 98% rename from internal/agent/session_checkpoint_agreement.go rename to internal/runtime/agent/session_checkpoint_agreement.go index 83d5dab31c..01d775953a 100644 --- a/internal/agent/session_checkpoint_agreement.go +++ b/internal/runtime/agent/session_checkpoint_agreement.go @@ -5,7 +5,7 @@ package agent import ( "log/slog" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // resolveReplayedMessages answers a replay that applied at least one record. diff --git a/internal/agent/session_checkpoint_lineage_test.go b/internal/runtime/agent/session_checkpoint_lineage_test.go similarity index 96% rename from internal/agent/session_checkpoint_lineage_test.go rename to internal/runtime/agent/session_checkpoint_lineage_test.go index 23b6ab757f..bae8874246 100644 --- a/internal/agent/session_checkpoint_lineage_test.go +++ b/internal/runtime/agent/session_checkpoint_lineage_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // The checkpoint is what a reader falls back to when the log cannot answer, so diff --git a/internal/agent/session_compat_legacy_test.go b/internal/runtime/agent/session_compat_legacy_test.go similarity index 98% rename from internal/agent/session_compat_legacy_test.go rename to internal/runtime/agent/session_compat_legacy_test.go index 86bd029e73..c06ab62f23 100644 --- a/internal/agent/session_compat_legacy_test.go +++ b/internal/runtime/agent/session_compat_legacy_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // Legacy session JSONL compatibility gate for the extension-kernel work. diff --git a/internal/agent/session_concurrency_test.go b/internal/runtime/agent/session_concurrency_test.go similarity index 97% rename from internal/agent/session_concurrency_test.go rename to internal/runtime/agent/session_concurrency_test.go index 0df89afc79..07c805fcf8 100644 --- a/internal/agent/session_concurrency_test.go +++ b/internal/runtime/agent/session_concurrency_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestSessionConcurrentAddAndRead models the real hazard: the run loop appends diff --git a/internal/agent/session_content.go b/internal/runtime/agent/session_content.go similarity index 98% rename from internal/agent/session_content.go rename to internal/runtime/agent/session_content.go index 01ac307ad7..c2dc247730 100644 --- a/internal/agent/session_content.go +++ b/internal/runtime/agent/session_content.go @@ -6,8 +6,8 @@ import ( "os" "time" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // ContentDigest returns the canonical digest used by the session WAL and diff --git a/internal/agent/session_display_index.go b/internal/runtime/agent/session_display_index.go similarity index 98% rename from internal/agent/session_display_index.go rename to internal/runtime/agent/session_display_index.go index 1574763b5f..6c3208a388 100644 --- a/internal/agent/session_display_index.go +++ b/internal/runtime/agent/session_display_index.go @@ -10,10 +10,10 @@ import ( "os" "time" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // SessionDisplayIndexSchemaVersion is the on-disk schema of the display index diff --git a/internal/agent/session_display_index_test.go b/internal/runtime/agent/session_display_index_test.go similarity index 99% rename from internal/agent/session_display_index_test.go rename to internal/runtime/agent/session_display_index_test.go index 5e55913f0c..59a2805471 100644 --- a/internal/agent/session_display_index_test.go +++ b/internal/runtime/agent/session_display_index_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // displayIndexTestMessages builds a multi-turn transcript exercising every diff --git a/internal/agent/session_display_range.go b/internal/runtime/agent/session_display_range.go similarity index 95% rename from internal/agent/session_display_range.go rename to internal/runtime/agent/session_display_range.go index ad72274368..543db56df3 100644 --- a/internal/agent/session_display_range.go +++ b/internal/runtime/agent/session_display_range.go @@ -6,8 +6,8 @@ import ( "io" "os" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // LoadSessionDisplayMessageRange decodes a bounded range through the display diff --git a/internal/agent/session_display_read_model.go b/internal/runtime/agent/session_display_read_model.go similarity index 98% rename from internal/agent/session_display_read_model.go rename to internal/runtime/agent/session_display_read_model.go index 7670f80543..dcdc40e533 100644 --- a/internal/agent/session_display_read_model.go +++ b/internal/runtime/agent/session_display_read_model.go @@ -7,8 +7,8 @@ import ( "os" "time" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // ErrSessionDisplayReadModelDamaged means the authoritative event log has a diff --git a/internal/agent/session_durability_test.go b/internal/runtime/agent/session_durability_test.go similarity index 99% rename from internal/agent/session_durability_test.go rename to internal/runtime/agent/session_durability_test.go index cde149d9fa..3e9b91809f 100644 --- a/internal/agent/session_durability_test.go +++ b/internal/runtime/agent/session_durability_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "reasonix/internal/fileutil" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // Crash-consistency model suite: a crash is injected at every durable diff --git a/internal/agent/session_events.go b/internal/runtime/agent/session_events.go similarity index 99% rename from internal/agent/session_events.go rename to internal/runtime/agent/session_events.go index 3e5bbac096..53bdcb7206 100644 --- a/internal/agent/session_events.go +++ b/internal/runtime/agent/session_events.go @@ -12,10 +12,10 @@ import ( "path/filepath" "time" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) const ( diff --git a/internal/agent/session_events_test.go b/internal/runtime/agent/session_events_test.go similarity index 99% rename from internal/agent/session_events_test.go rename to internal/runtime/agent/session_events_test.go index b51c634db1..cb404a50e2 100644 --- a/internal/agent/session_events_test.go +++ b/internal/runtime/agent/session_events_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) func sessionWithTurns(t *testing.T, path string, turns int) *Session { diff --git a/internal/agent/session_lease.go b/internal/runtime/agent/session_lease.go similarity index 99% rename from internal/agent/session_lease.go rename to internal/runtime/agent/session_lease.go index 3ee3182f75..f1e6a88167 100644 --- a/internal/agent/session_lease.go +++ b/internal/runtime/agent/session_lease.go @@ -13,9 +13,9 @@ import ( "sync/atomic" "time" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/state/store" ) var ErrSessionLeaseHeld = errors.New("session lease held by another runtime") diff --git a/internal/agent/session_lease_probe_test.go b/internal/runtime/agent/session_lease_probe_test.go similarity index 96% rename from internal/agent/session_lease_probe_test.go rename to internal/runtime/agent/session_lease_probe_test.go index 547e5ae00f..f4437f64f9 100644 --- a/internal/agent/session_lease_probe_test.go +++ b/internal/runtime/agent/session_lease_probe_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // The store-P2 write-authority probe must record an unleased save once per diff --git a/internal/agent/session_lease_test.go b/internal/runtime/agent/session_lease_test.go similarity index 99% rename from internal/agent/session_lease_test.go rename to internal/runtime/agent/session_lease_test.go index 875267c576..eb28951450 100644 --- a/internal/agent/session_lease_test.go +++ b/internal/runtime/agent/session_lease_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/store" ) // leaseTestPath returns a session path in "user shape" — mixed case, exactly diff --git a/internal/agent/session_listing_helpers.go b/internal/runtime/agent/session_listing_helpers.go similarity index 100% rename from internal/agent/session_listing_helpers.go rename to internal/runtime/agent/session_listing_helpers.go diff --git a/internal/agent/session_listing_race_test.go b/internal/runtime/agent/session_listing_race_test.go similarity index 97% rename from internal/agent/session_listing_race_test.go rename to internal/runtime/agent/session_listing_race_test.go index 3db6501702..7c48feed37 100644 --- a/internal/agent/session_listing_race_test.go +++ b/internal/runtime/agent/session_listing_race_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) func TestSessionListingBackfillDoesNotOverwriteNewerCounts(t *testing.T) { diff --git a/internal/agent/session_lock_unix.go b/internal/runtime/agent/session_lock_unix.go similarity index 98% rename from internal/agent/session_lock_unix.go rename to internal/runtime/agent/session_lock_unix.go index 377359145b..0b92dbe6d3 100644 --- a/internal/agent/session_lock_unix.go +++ b/internal/runtime/agent/session_lock_unix.go @@ -6,7 +6,7 @@ import ( "errors" "os" - "reasonix/internal/store" + "reasonix/internal/state/store" "golang.org/x/sys/unix" ) diff --git a/internal/agent/session_lock_windows.go b/internal/runtime/agent/session_lock_windows.go similarity index 99% rename from internal/agent/session_lock_windows.go rename to internal/runtime/agent/session_lock_windows.go index e5b81d8640..49e9136e53 100644 --- a/internal/agent/session_lock_windows.go +++ b/internal/runtime/agent/session_lock_windows.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "unsafe" - "reasonix/internal/store" + "reasonix/internal/state/store" "golang.org/x/sys/windows" ) diff --git a/internal/agent/session_lock_windows_test.go b/internal/runtime/agent/session_lock_windows_test.go similarity index 98% rename from internal/agent/session_lock_windows_test.go rename to internal/runtime/agent/session_lock_windows_test.go index 8a8edfe0f5..aa64ea66af 100644 --- a/internal/agent/session_lock_windows_test.go +++ b/internal/runtime/agent/session_lock_windows_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestRemoveAndUnlockDeletesViaDispositionNotFallback pins the Windows delete diff --git a/internal/agent/session_meta_ledger_test.go b/internal/runtime/agent/session_meta_ledger_test.go similarity index 99% rename from internal/agent/session_meta_ledger_test.go rename to internal/runtime/agent/session_meta_ledger_test.go index b3824ef4d9..c4de60883f 100644 --- a/internal/agent/session_meta_ledger_test.go +++ b/internal/runtime/agent/session_meta_ledger_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // shrinkMetaReadBackoffs keeps corrupt-sidecar tests fast. Only the pacing of diff --git a/internal/agent/session_persist_observer.go b/internal/runtime/agent/session_persist_observer.go similarity index 98% rename from internal/agent/session_persist_observer.go rename to internal/runtime/agent/session_persist_observer.go index bc6973ec25..4c1d525c65 100644 --- a/internal/agent/session_persist_observer.go +++ b/internal/runtime/agent/session_persist_observer.go @@ -3,7 +3,7 @@ package agent import ( "os" - "reasonix/internal/store" + "reasonix/internal/state/store" ) // SessionPersistEvent is emitted only after the authoritative transcript, diff --git a/internal/agent/session_removal.go b/internal/runtime/agent/session_removal.go similarity index 99% rename from internal/agent/session_removal.go rename to internal/runtime/agent/session_removal.go index 6c9ae816f3..44575498a3 100644 --- a/internal/agent/session_removal.go +++ b/internal/runtime/agent/session_removal.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "reasonix/internal/store" + "reasonix/internal/state/store" ) // SessionRemovalGuard holds a session's save lock and lease lock for the diff --git a/internal/agent/session_removal_test.go b/internal/runtime/agent/session_removal_test.go similarity index 98% rename from internal/agent/session_removal_test.go rename to internal/runtime/agent/session_removal_test.go index c07d63c708..e91f1a2406 100644 --- a/internal/agent/session_removal_test.go +++ b/internal/runtime/agent/session_removal_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) func TestSessionRemovalGuardBlocksWhileLeaseHeld(t *testing.T) { diff --git a/internal/agent/session_temp_subagent_test.go b/internal/runtime/agent/session_temp_subagent_test.go similarity index 97% rename from internal/agent/session_temp_subagent_test.go rename to internal/runtime/agent/session_temp_subagent_test.go index eeccd4b4e9..f9b28457ce 100644 --- a/internal/agent/session_temp_subagent_test.go +++ b/internal/runtime/agent/session_temp_subagent_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/sessiontemp" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/sessiontemp" ) func TestWithSubagentSessionTempIsIndependent(t *testing.T) { diff --git a/internal/agent/session_test.go b/internal/runtime/agent/session_test.go similarity index 99% rename from internal/agent/session_test.go rename to internal/runtime/agent/session_test.go index d118fe49a7..753b93e160 100644 --- a/internal/agent/session_test.go +++ b/internal/runtime/agent/session_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) // NewSession diff --git a/internal/agent/session_torn_log_recovery_test.go b/internal/runtime/agent/session_torn_log_recovery_test.go similarity index 98% rename from internal/agent/session_torn_log_recovery_test.go rename to internal/runtime/agent/session_torn_log_recovery_test.go index 47cf9c6351..0402ef65c4 100644 --- a/internal/agent/session_torn_log_recovery_test.go +++ b/internal/runtime/agent/session_torn_log_recovery_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/state/store" ) // tearEventLogTail is what an unclean exit leaves behind: the last record never diff --git a/internal/agent/session_write_authority.go b/internal/runtime/agent/session_write_authority.go similarity index 100% rename from internal/agent/session_write_authority.go rename to internal/runtime/agent/session_write_authority.go diff --git a/internal/agent/session_write_authority_test.go b/internal/runtime/agent/session_write_authority_test.go similarity index 98% rename from internal/agent/session_write_authority_test.go rename to internal/runtime/agent/session_write_authority_test.go index ca31194f75..d0eaa6eba4 100644 --- a/internal/agent/session_write_authority_test.go +++ b/internal/runtime/agent/session_write_authority_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestWriteAuthorityStaleAfterRelease(t *testing.T) { diff --git a/internal/agent/sessionpreview.go b/internal/runtime/agent/sessionpreview.go similarity index 98% rename from internal/agent/sessionpreview.go rename to internal/runtime/agent/sessionpreview.go index 35c762ad77..b1a7bbef4b 100644 --- a/internal/agent/sessionpreview.go +++ b/internal/runtime/agent/sessionpreview.go @@ -3,7 +3,7 @@ package agent import ( "strings" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // SessionPreview returns the same preview and user-turn count used by diff --git a/internal/agent/sessionstate.go b/internal/runtime/agent/sessionstate.go similarity index 98% rename from internal/agent/sessionstate.go rename to internal/runtime/agent/sessionstate.go index cc7afba235..6fd4ba4efa 100644 --- a/internal/agent/sessionstate.go +++ b/internal/runtime/agent/sessionstate.go @@ -4,8 +4,8 @@ import ( "sync" "sync/atomic" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) // sessionRuntime is the host state one conversation owns. Its lifetime sits diff --git a/internal/agent/sessionstate_test.go b/internal/runtime/agent/sessionstate_test.go similarity index 100% rename from internal/agent/sessionstate_test.go rename to internal/runtime/agent/sessionstate_test.go diff --git a/internal/agent/shell_contract_test.go b/internal/runtime/agent/shell_contract_test.go similarity index 99% rename from internal/agent/shell_contract_test.go rename to internal/runtime/agent/shell_contract_test.go index b28d71495c..d1fdf467a4 100644 --- a/internal/agent/shell_contract_test.go +++ b/internal/runtime/agent/shell_contract_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" - "reasonix/internal/tool/builtin" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/tools/builtin" ) func TestOrdinaryModeBlocksMixedMutationAndVerification(t *testing.T) { diff --git a/internal/agent/shell_shape_gates.go b/internal/runtime/agent/shell_shape_gates.go similarity index 99% rename from internal/agent/shell_shape_gates.go rename to internal/runtime/agent/shell_shape_gates.go index 3ea295d50c..21edc1143f 100644 --- a/internal/agent/shell_shape_gates.go +++ b/internal/runtime/agent/shell_shape_gates.go @@ -3,7 +3,7 @@ package agent import ( "context" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // applyShellShapeGates holds the deterministic command-shape contract: shapes a diff --git a/internal/agent/shell_verification.go b/internal/runtime/agent/shell_verification.go similarity index 95% rename from internal/agent/shell_verification.go rename to internal/runtime/agent/shell_verification.go index cddb58e06b..c7c0d3dd6f 100644 --- a/internal/agent/shell_verification.go +++ b/internal/runtime/agent/shell_verification.go @@ -4,9 +4,9 @@ import ( "encoding/json" "strings" - "reasonix/internal/evidence" - "reasonix/internal/shellparse" - "reasonix/internal/tool" + "reasonix/internal/base/shellparse" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // shellVerificationVerdict reads a verification's outcome off what the host diff --git a/internal/agent/shown_paths.go b/internal/runtime/agent/shown_paths.go similarity index 98% rename from internal/agent/shown_paths.go rename to internal/runtime/agent/shown_paths.go index 4aa184f8b3..53e7f5ec68 100644 --- a/internal/agent/shown_paths.go +++ b/internal/runtime/agent/shown_paths.go @@ -4,7 +4,7 @@ import ( "os" "slices" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // witnessFileLimit bounds how much of a file the host will read to build a diff --git a/internal/agent/shown_paths_test.go b/internal/runtime/agent/shown_paths_test.go similarity index 97% rename from internal/agent/shown_paths_test.go rename to internal/runtime/agent/shown_paths_test.go index a6c533f5c1..40dbba9ba7 100644 --- a/internal/agent/shown_paths_test.go +++ b/internal/runtime/agent/shown_paths_test.go @@ -6,8 +6,8 @@ import ( "slices" "testing" - "reasonix/internal/evidence" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/evidence" ) const witnessBefore = "package tally\n\nfunc Sum(xs []int) int {\n\ttotal := 0\n\treturn total\n}\n" diff --git a/internal/agent/silent_exit.go b/internal/runtime/agent/silent_exit.go similarity index 98% rename from internal/agent/silent_exit.go rename to internal/runtime/agent/silent_exit.go index de67e5c84f..83e75f4804 100644 --- a/internal/agent/silent_exit.go +++ b/internal/runtime/agent/silent_exit.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // silentExitIsAnAnswer reports whether a non-zero exit reported something rather diff --git a/internal/agent/silent_exit_test.go b/internal/runtime/agent/silent_exit_test.go similarity index 86% rename from internal/agent/silent_exit_test.go rename to internal/runtime/agent/silent_exit_test.go index 1840ae17ce..b9757794da 100644 --- a/internal/agent/silent_exit_test.go +++ b/internal/runtime/agent/silent_exit_test.go @@ -20,7 +20,7 @@ func bashArgs(t *testing.T, command string) json.RawMessage { func TestSilentExitIsAnAnswer(t *testing.T) { answers := []string{ `grep -rn "missing" internal --include="*.go" | grep -v _test.go | head -20`, - `test -f internal/agent/nothing.go`, + `test -f internal/runtime/agent/nothing.go`, `git diff --quiet`, } for _, command := range answers { @@ -32,10 +32,10 @@ func TestSilentExitIsAnAnswer(t *testing.T) { command string output string }{ - {`go test ./internal/agent/ > /dev/null`, ""}, // a verification's status is its verdict - {`go build ./... 2>/dev/null`, ""}, // the host cannot prove it wrote nothing + {`go test ./internal/runtime/agent/ > /dev/null`, ""}, // a verification's status is its verdict + {`go build ./... 2>/dev/null`, ""}, // the host cannot prove it wrote nothing {`rm -rf build`, ""}, - {`grep -rn "x" internal`, "internal/agent/agent.go:1:x"}, // it printed something + {`grep -rn "x" internal`, "internal/runtime/agent/agent.go:1:x"}, // it printed something } for _, tc := range failures { if silentExitIsAnAnswer("bash", bashArgs(t, tc.command), tc.output) { diff --git a/internal/agent/slot.go b/internal/runtime/agent/slot.go similarity index 100% rename from internal/agent/slot.go rename to internal/runtime/agent/slot.go diff --git a/internal/agent/spawn_boundary_test.go b/internal/runtime/agent/spawn_boundary_test.go similarity index 86% rename from internal/agent/spawn_boundary_test.go rename to internal/runtime/agent/spawn_boundary_test.go index db78a8abb0..0d25f8e9df 100644 --- a/internal/agent/spawn_boundary_test.go +++ b/internal/runtime/agent/spawn_boundary_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // knownDirectChildRunners are the entry points that still construct a child @@ -19,16 +19,16 @@ import ( // gets missed in another. The list may shrink; adding to it needs a reason in // the pull request. var knownDirectChildRunners = map[string]string{ - "internal/agent/task.go": "defines the runners and is the unified path itself", - "internal/boot/skill_subagent.go": "run_skill + read_only_skill runners", - "internal/cli/review.go": "reasonix review", - "desktop/subagents_app.go": "desktop profile preview", + "internal/runtime/agent/task.go": "defines the runners and is the unified path itself", + "internal/assembly/boot/skill_subagent.go": "run_skill + read_only_skill runners", + "internal/frontend/cli/review.go": "reasonix review", + "desktop/subagents_app.go": "desktop profile preview", } // A new fork must be a deliberate, reviewed choice rather than something that // appears because one more caller found the low-level runner convenient. func TestChildConstructionForksStayEnumerated(t *testing.T) { - root, err := filepath.Abs("../..") + root, err := filepath.Abs("../../..") if err != nil { t.Fatal(err) } diff --git a/internal/agent/stale_anchor_guard_test.go b/internal/runtime/agent/stale_anchor_guard_test.go similarity index 98% rename from internal/agent/stale_anchor_guard_test.go rename to internal/runtime/agent/stale_anchor_guard_test.go index 8788a18996..f3949c57b4 100644 --- a/internal/agent/stale_anchor_guard_test.go +++ b/internal/runtime/agent/stale_anchor_guard_test.go @@ -6,9 +6,9 @@ import ( "sync/atomic" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestDeleteRangeRequiresReadAfterSameTurnWrite(t *testing.T) { diff --git a/internal/agent/steer_flush_test.go b/internal/runtime/agent/steer_flush_test.go similarity index 97% rename from internal/agent/steer_flush_test.go rename to internal/runtime/agent/steer_flush_test.go index ae509c7a95..7616471378 100644 --- a/internal/agent/steer_flush_test.go +++ b/internal/runtime/agent/steer_flush_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" ) // steerThenCancelTool queues a steer while the turn is running, then cancels diff --git a/internal/agent/steer_inbox.go b/internal/runtime/agent/steer_inbox.go similarity index 99% rename from internal/agent/steer_inbox.go rename to internal/runtime/agent/steer_inbox.go index a94025ba7f..c66df69f6f 100644 --- a/internal/agent/steer_inbox.go +++ b/internal/runtime/agent/steer_inbox.go @@ -4,8 +4,8 @@ package agent import ( "sync" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // steerEntry is one mid-turn guidance admission. host marks the ones the diff --git a/internal/agent/steer_queue_test.go b/internal/runtime/agent/steer_queue_test.go similarity index 100% rename from internal/agent/steer_queue_test.go rename to internal/runtime/agent/steer_queue_test.go diff --git a/internal/agent/steer_test.go b/internal/runtime/agent/steer_test.go similarity index 100% rename from internal/agent/steer_test.go rename to internal/runtime/agent/steer_test.go diff --git a/internal/agent/steertext.go b/internal/runtime/agent/steertext.go similarity index 100% rename from internal/agent/steertext.go rename to internal/runtime/agent/steertext.go diff --git a/internal/agent/stream_attempt_id_test.go b/internal/runtime/agent/stream_attempt_id_test.go similarity index 100% rename from internal/agent/stream_attempt_id_test.go rename to internal/runtime/agent/stream_attempt_id_test.go diff --git a/internal/agent/sub_registry.go b/internal/runtime/agent/sub_registry.go similarity index 97% rename from internal/agent/sub_registry.go rename to internal/runtime/agent/sub_registry.go index dfc7a0f856..aa219930da 100644 --- a/internal/agent/sub_registry.go +++ b/internal/runtime/agent/sub_registry.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // subRegistryFor narrows the parent's tools to what this run may touch: the diff --git a/internal/agent/subagent_cancel_test.go b/internal/runtime/agent/subagent_cancel_test.go similarity index 98% rename from internal/agent/subagent_cancel_test.go rename to internal/runtime/agent/subagent_cancel_test.go index 37f7db3371..4fc9469a9e 100644 --- a/internal/agent/subagent_cancel_test.go +++ b/internal/runtime/agent/subagent_cancel_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) func cancelTestRun(t *testing.T) (*SubagentStore, *SubagentRun) { diff --git a/internal/agent/subagent_cleanup_test.go b/internal/runtime/agent/subagent_cleanup_test.go similarity index 96% rename from internal/agent/subagent_cleanup_test.go rename to internal/runtime/agent/subagent_cleanup_test.go index 166622fe7d..b01cf8dd5f 100644 --- a/internal/agent/subagent_cleanup_test.go +++ b/internal/runtime/agent/subagent_cleanup_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/store" ) func TestDeleteSubagentsByParentSweepsEventLogLeftovers(t *testing.T) { diff --git a/internal/agent/subagent_handoff_shadow.go b/internal/runtime/agent/subagent_handoff_shadow.go similarity index 97% rename from internal/agent/subagent_handoff_shadow.go rename to internal/runtime/agent/subagent_handoff_shadow.go index 8b837fd781..d130037878 100644 --- a/internal/agent/subagent_handoff_shadow.go +++ b/internal/runtime/agent/subagent_handoff_shadow.go @@ -6,8 +6,8 @@ import ( "errors" "strings" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // Nothing here decides anything: no prompt byte moves, no notice is emitted, no diff --git a/internal/agent/subagent_identity.go b/internal/runtime/agent/subagent_identity.go similarity index 92% rename from internal/agent/subagent_identity.go rename to internal/runtime/agent/subagent_identity.go index 260a39da5a..9c1e64950e 100644 --- a/internal/agent/subagent_identity.go +++ b/internal/runtime/agent/subagent_identity.go @@ -5,7 +5,7 @@ import ( "encoding/json" "slices" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func toolIdentity(reg *tool.Registry, ctx context.Context) ([]string, string) { diff --git a/internal/agent/subagent_list.go b/internal/runtime/agent/subagent_list.go similarity index 99% rename from internal/agent/subagent_list.go rename to internal/runtime/agent/subagent_list.go index 0c8e518368..38154f2b9e 100644 --- a/internal/agent/subagent_list.go +++ b/internal/runtime/agent/subagent_list.go @@ -10,7 +10,7 @@ import ( "slices" "strings" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // maxListedSubagents bounds one listing. A conversation that spawned hundreds diff --git a/internal/agent/subagent_list_test.go b/internal/runtime/agent/subagent_list_test.go similarity index 98% rename from internal/agent/subagent_list_test.go rename to internal/runtime/agent/subagent_list_test.go index b525d2f8eb..6db0513bbd 100644 --- a/internal/agent/subagent_list_test.go +++ b/internal/runtime/agent/subagent_list_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) func saveListedChild(t *testing.T, store *SubagentStore, spec SubagentSpec, save func(*SubagentStore, *SubagentRun) error) string { diff --git a/internal/agent/subagent_parent_probe_test.go b/internal/runtime/agent/subagent_parent_probe_test.go similarity index 98% rename from internal/agent/subagent_parent_probe_test.go rename to internal/runtime/agent/subagent_parent_probe_test.go index 46ef446ba3..d6f971a8e0 100644 --- a/internal/agent/subagent_parent_probe_test.go +++ b/internal/runtime/agent/subagent_parent_probe_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestSubagentStoreCleanupStaleRunningParentProbe(t *testing.T) { diff --git a/internal/agent/subagent_progress.go b/internal/runtime/agent/subagent_progress.go similarity index 99% rename from internal/agent/subagent_progress.go rename to internal/runtime/agent/subagent_progress.go index 22ae66e97c..bb7ac46d2d 100644 --- a/internal/agent/subagent_progress.go +++ b/internal/runtime/agent/subagent_progress.go @@ -7,7 +7,7 @@ import ( "time" "unicode/utf8" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // Sub-agent progress previews. A tracker per child run converts the child's diff --git a/internal/agent/subagent_progress_test.go b/internal/runtime/agent/subagent_progress_test.go similarity index 99% rename from internal/agent/subagent_progress_test.go rename to internal/runtime/agent/subagent_progress_test.go index 7273092055..da48dd043d 100644 --- a/internal/agent/subagent_progress_test.go +++ b/internal/runtime/agent/subagent_progress_test.go @@ -10,10 +10,10 @@ import ( "time" "unicode/utf8" - "reasonix/internal/event" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/jobs" ) // fakeProgressClock drives the merger's pacing deterministically: tests advance diff --git a/internal/agent/subagent_registry_test.go b/internal/runtime/agent/subagent_registry_test.go similarity index 99% rename from internal/agent/subagent_registry_test.go rename to internal/runtime/agent/subagent_registry_test.go index c1d2df67ca..f4efe856c5 100644 --- a/internal/agent/subagent_registry_test.go +++ b/internal/runtime/agent/subagent_registry_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/capability" - "reasonix/internal/plugin" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" + "reasonix/internal/runtime/capability" ) type subagentRegistryTool struct { diff --git a/internal/agent/subagent_report.go b/internal/runtime/agent/subagent_report.go similarity index 98% rename from internal/agent/subagent_report.go rename to internal/runtime/agent/subagent_report.go index 648c693cf1..b8d922a908 100644 --- a/internal/agent/subagent_report.go +++ b/internal/runtime/agent/subagent_report.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // hostReceiptsMaxItems bounds each rendered line so a long child run cannot diff --git a/internal/agent/subagent_report_test.go b/internal/runtime/agent/subagent_report_test.go similarity index 97% rename from internal/agent/subagent_report_test.go rename to internal/runtime/agent/subagent_report_test.go index 285673c4e8..b0870d9440 100644 --- a/internal/agent/subagent_report_test.go +++ b/internal/runtime/agent/subagent_report_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func TestHostReceiptsAttestChangesAndVerifications(t *testing.T) { diff --git a/internal/agent/subagent_result.go b/internal/runtime/agent/subagent_result.go similarity index 99% rename from internal/agent/subagent_result.go rename to internal/runtime/agent/subagent_result.go index 87f6eb2fdc..85d7629777 100644 --- a/internal/agent/subagent_result.go +++ b/internal/runtime/agent/subagent_result.go @@ -9,7 +9,7 @@ import ( "strings" "unicode/utf8" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) const ( diff --git a/internal/agent/subagent_result_test.go b/internal/runtime/agent/subagent_result_test.go similarity index 96% rename from internal/agent/subagent_result_test.go rename to internal/runtime/agent/subagent_result_test.go index 71a199e494..3ba750dbdf 100644 --- a/internal/agent/subagent_result_test.go +++ b/internal/runtime/agent/subagent_result_test.go @@ -7,9 +7,9 @@ import ( "testing" "unicode/utf8" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestSubagentResultToolContractIsStableAndReadOnly(t *testing.T) { diff --git a/internal/agent/subagent_store.go b/internal/runtime/agent/subagent_store.go similarity index 99% rename from internal/agent/subagent_store.go rename to internal/runtime/agent/subagent_store.go index af95517b7e..e6b0f4ad13 100644 --- a/internal/agent/subagent_store.go +++ b/internal/runtime/agent/subagent_store.go @@ -16,10 +16,10 @@ import ( "sync" "time" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/store" - "reasonix/internal/tool" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/tool" + "reasonix/internal/state/store" ) type SubagentStatus string diff --git a/internal/agent/subagent_store_test.go b/internal/runtime/agent/subagent_store_test.go similarity index 99% rename from internal/agent/subagent_store_test.go rename to internal/runtime/agent/subagent_store_test.go index 36d76be0fd..add3190e93 100644 --- a/internal/agent/subagent_store_test.go +++ b/internal/runtime/agent/subagent_store_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestSubagentStoreContinueLoadsSavedTranscript(t *testing.T) { diff --git a/internal/agent/subagent_store_traversal_test.go b/internal/runtime/agent/subagent_store_traversal_test.go similarity index 97% rename from internal/agent/subagent_store_traversal_test.go rename to internal/runtime/agent/subagent_store_traversal_test.go index 49d5a43934..d8796f0fef 100644 --- a/internal/agent/subagent_store_traversal_test.go +++ b/internal/runtime/agent/subagent_store_traversal_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // Lineage walks build paths from session identifiers — the caller-provided diff --git a/internal/agent/subagent_terminal.go b/internal/runtime/agent/subagent_terminal.go similarity index 100% rename from internal/agent/subagent_terminal.go rename to internal/runtime/agent/subagent_terminal.go diff --git a/internal/agent/submit_plan.go b/internal/runtime/agent/submit_plan.go similarity index 98% rename from internal/agent/submit_plan.go rename to internal/runtime/agent/submit_plan.go index db75f9c86e..467a12c172 100644 --- a/internal/agent/submit_plan.go +++ b/internal/runtime/agent/submit_plan.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "reasonix/internal/plancontract" - "reasonix/internal/tool" + "reasonix/internal/contract/plancontract" + "reasonix/internal/contract/tool" ) // SubmitPlanTool is the planner's structured exit: it hands the host a plan as diff --git a/internal/agent/submit_plan_test.go b/internal/runtime/agent/submit_plan_test.go similarity index 94% rename from internal/agent/submit_plan_test.go rename to internal/runtime/agent/submit_plan_test.go index 2b43dac6be..99eb26674e 100644 --- a/internal/agent/submit_plan_test.go +++ b/internal/runtime/agent/submit_plan_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/plancontract" + "reasonix/internal/contract/plancontract" ) func submitPlan(t *testing.T, ctx context.Context, args string) (string, error) { @@ -16,12 +16,12 @@ func submitPlan(t *testing.T, ctx context.Context, args string) (string, error) const wellFormedPlanArgs = `{ "objective":"make the cache key model-aware", - "assumptions":[{"text":"warm caches are disposable","confirm":"rg cacheKey internal/provider"}], + "assumptions":[{"text":"warm caches are disposable","confirm":"rg cacheKey internal/contract/provider"}], "steps":[ - {"id":"p1","title":"thread the model ref through","verified_files":["internal/provider/cache.go"],"candidate_files":["internal/boot/boot.go"]}, + {"id":"p1","title":"thread the model ref through","verified_files":["internal/contract/provider/cache.go"],"candidate_files":["internal/assembly/boot/boot.go"]}, {"id":"s1","parent_id":"p1","title":"extend cacheKey", "acceptance":[{"text":"two model refs never share an entry"},{"text":"existing hits keep hitting","regression":true}], - "verification":[{"command":"go test ./internal/provider/","expect":"all green"}]}, + "verification":[{"command":"go test ./internal/contract/provider/","expect":"all green"}]}, {"id":"p2","title":"record the hit rate"} ] }` @@ -46,7 +46,7 @@ func TestSubmitPlanRecordsAStructuredPlan(t *testing.T) { if len(step.VerifiedFiles) != 0 || len(step.Acceptance) != 2 || !step.Acceptance[1].Regression { t.Fatalf("sub-step lost its fields: %+v", step) } - if plan.Steps[0].VerifiedFiles[0] != "internal/provider/cache.go" || plan.Steps[0].CandidateFiles[0] != "internal/boot/boot.go" { + if plan.Steps[0].VerifiedFiles[0] != "internal/contract/provider/cache.go" || plan.Steps[0].CandidateFiles[0] != "internal/assembly/boot/boot.go" { t.Fatalf("verified/candidate surfaces did not survive: %+v", plan.Steps[0]) } } diff --git a/internal/agent/summary_verdict_test.go b/internal/runtime/agent/summary_verdict_test.go similarity index 96% rename from internal/agent/summary_verdict_test.go rename to internal/runtime/agent/summary_verdict_test.go index 55e1f8ca10..fce4a54510 100644 --- a/internal/agent/summary_verdict_test.go +++ b/internal/runtime/agent/summary_verdict_test.go @@ -3,9 +3,9 @@ package agent import ( "testing" - "reasonix/internal/completion" - "reasonix/internal/evidence" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/completion" + "reasonix/internal/runtime/evidence" ) func ledgerWith(receipts ...evidence.Receipt) *evidence.Ledger { diff --git a/internal/agent/task.go b/internal/runtime/agent/task.go similarity index 99% rename from internal/agent/task.go rename to internal/runtime/agent/task.go index 3edfc402bc..c05c92cadb 100644 --- a/internal/agent/task.go +++ b/internal/runtime/agent/task.go @@ -14,17 +14,17 @@ import ( "strings" "time" - "reasonix/internal/ablation" - "reasonix/internal/checkpoint" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/jobs" - "reasonix/internal/memory" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" - "reasonix/internal/workspacelease" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" + "reasonix/internal/state/checkpoint" + "reasonix/internal/state/memory" + "reasonix/internal/state/sessiontemp" + "reasonix/internal/state/workspacelease" ) // withSubagentSessionTemp installs a fresh session-private temporary directory @@ -1601,7 +1601,7 @@ func FormatSubagentRunResult(answer string, run *SubagentRun, failed bool) strin // GuardSubagentHostDecisionText appends a fixed boundary warning only when a // child agent result appears to discuss host approval or user-owned decisions. -// The implementation lives in internal/tool so the skill tools share the exact +// The implementation lives in internal/contract/tool so the skill tools share the exact // same phrase list and notice. func GuardSubagentHostDecisionText(answer string) string { return tool.GuardSubagentHostDecisionText(answer) diff --git a/internal/agent/task_background_queue_test.go b/internal/runtime/agent/task_background_queue_test.go similarity index 93% rename from internal/agent/task_background_queue_test.go rename to internal/runtime/agent/task_background_queue_test.go index 5404efcd7c..546d7c1a6d 100644 --- a/internal/agent/task_background_queue_test.go +++ b/internal/runtime/agent/task_background_queue_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "reasonix/internal/checkpoint" - "reasonix/internal/event" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/jobs" + "reasonix/internal/state/checkpoint" ) // TestBackgroundTaskReturnsBeforeSlotFrees ensures run_in_background returns a diff --git a/internal/agent/task_budget.go b/internal/runtime/agent/task_budget.go similarity index 100% rename from internal/agent/task_budget.go rename to internal/runtime/agent/task_budget.go diff --git a/internal/agent/task_budget_gate_test.go b/internal/runtime/agent/task_budget_gate_test.go similarity index 98% rename from internal/agent/task_budget_gate_test.go rename to internal/runtime/agent/task_budget_gate_test.go index 48654b9c08..5bdcbfb506 100644 --- a/internal/agent/task_budget_gate_test.go +++ b/internal/runtime/agent/task_budget_gate_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // The gate must stop a runaway on the axis it actually runs away on. This diff --git a/internal/agent/task_options_test.go b/internal/runtime/agent/task_options_test.go similarity index 98% rename from internal/agent/task_options_test.go rename to internal/runtime/agent/task_options_test.go index efa27c8657..59dea5a1e7 100644 --- a/internal/agent/task_options_test.go +++ b/internal/runtime/agent/task_options_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestNewTaskToolWithOptionsMatchesPositional(t *testing.T) { diff --git a/internal/agent/task_profile_test.go b/internal/runtime/agent/task_profile_test.go similarity index 97% rename from internal/agent/task_profile_test.go rename to internal/runtime/agent/task_profile_test.go index d592689893..164e8e5bb9 100644 --- a/internal/agent/task_profile_test.go +++ b/internal/runtime/agent/task_profile_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestTaskSchemaIncludesProfileAndWritePaths(t *testing.T) { diff --git a/internal/agent/task_test.go b/internal/runtime/agent/task_test.go similarity index 99% rename from internal/agent/task_test.go rename to internal/runtime/agent/task_test.go index cdb802a2f2..7b9b54c917 100644 --- a/internal/agent/task_test.go +++ b/internal/runtime/agent/task_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" ) func testTaskContext() context.Context { diff --git a/internal/agent/taskpolicy_execution_test.go b/internal/runtime/agent/taskpolicy_execution_test.go similarity index 95% rename from internal/agent/taskpolicy_execution_test.go rename to internal/runtime/agent/taskpolicy_execution_test.go index f89674cb18..d687a47b16 100644 --- a/internal/agent/taskpolicy_execution_test.go +++ b/internal/runtime/agent/taskpolicy_execution_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/instruction" - "reasonix/internal/provider" - "reasonix/internal/taskpolicy" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/taskpolicy" + "reasonix/internal/state/instruction" ) // A registered explore worker is the model's to call. The turn policy carries diff --git a/internal/agent/taskstate.go b/internal/runtime/agent/taskstate.go similarity index 98% rename from internal/agent/taskstate.go rename to internal/runtime/agent/taskstate.go index 33b88aa5bb..5a520e18df 100644 --- a/internal/agent/taskstate.go +++ b/internal/runtime/agent/taskstate.go @@ -3,7 +3,7 @@ package agent import ( "sync/atomic" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // taskRuntime is the host state shared by every Agent.Run continuing one diff --git a/internal/agent/taskstate_test.go b/internal/runtime/agent/taskstate_test.go similarity index 99% rename from internal/agent/taskstate_test.go rename to internal/runtime/agent/taskstate_test.go index b72e4ac75b..f66a3e9b12 100644 --- a/internal/agent/taskstate_test.go +++ b/internal/runtime/agent/taskstate_test.go @@ -6,7 +6,7 @@ import ( "go/token" "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // taskCarryOver names the fields restartLedger hands to the next task in the diff --git a/internal/agent/testdata/capability_list.json b/internal/runtime/agent/testdata/capability_list.json similarity index 100% rename from internal/agent/testdata/capability_list.json rename to internal/runtime/agent/testdata/capability_list.json diff --git a/internal/agent/testutil/mock_provider.go b/internal/runtime/agent/testutil/mock_provider.go similarity index 99% rename from internal/agent/testutil/mock_provider.go rename to internal/runtime/agent/testutil/mock_provider.go index d94e5c7f8b..42662a98cd 100644 --- a/internal/agent/testutil/mock_provider.go +++ b/internal/runtime/agent/testutil/mock_provider.go @@ -10,7 +10,7 @@ import ( "fmt" "sync" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // Turn describes one expected Stream call: the text, optional reasoning, diff --git a/internal/agent/testutil/mock_provider_test.go b/internal/runtime/agent/testutil/mock_provider_test.go similarity index 97% rename from internal/agent/testutil/mock_provider_test.go rename to internal/runtime/agent/testutil/mock_provider_test.go index 35ef269f55..152678055b 100644 --- a/internal/agent/testutil/mock_provider_test.go +++ b/internal/runtime/agent/testutil/mock_provider_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestMockProviderStreamHonorsCanceledContext(t *testing.T) { diff --git a/internal/agent/textsink.go b/internal/runtime/agent/textsink.go similarity index 99% rename from internal/agent/textsink.go rename to internal/runtime/agent/textsink.go index 1138bf56bd..db675057c4 100644 --- a/internal/agent/textsink.go +++ b/internal/runtime/agent/textsink.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/provider" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // TextSink renders a turn's event stream to ANSI text on an io.Writer. It is diff --git a/internal/agent/textsink_partial_test.go b/internal/runtime/agent/textsink_partial_test.go similarity index 96% rename from internal/agent/textsink_partial_test.go rename to internal/runtime/agent/textsink_partial_test.go index aabbcbde29..7cb1210b90 100644 --- a/internal/agent/textsink_partial_test.go +++ b/internal/runtime/agent/textsink_partial_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // TestTextSinkSkipsPartialDispatch probes the headless sink against the early diff --git a/internal/agent/textsink_test.go b/internal/runtime/agent/textsink_test.go similarity index 98% rename from internal/agent/textsink_test.go rename to internal/runtime/agent/textsink_test.go index 086d1845de..b559dcb0f4 100644 --- a/internal/agent/textsink_test.go +++ b/internal/runtime/agent/textsink_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // TestTextSinkReproducesInlineOutput pins the byte-exact rendering of a turn's diff --git a/internal/agent/textsink_usage_test.go b/internal/runtime/agent/textsink_usage_test.go similarity index 96% rename from internal/agent/textsink_usage_test.go rename to internal/runtime/agent/textsink_usage_test.go index 38125f2022..83567688fe 100644 --- a/internal/agent/textsink_usage_test.go +++ b/internal/runtime/agent/textsink_usage_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TestFormatUsageLineSurfacesMultiRequestTurns pins the reading fix: the input diff --git a/internal/agent/title_test.go b/internal/runtime/agent/title_test.go similarity index 100% rename from internal/agent/title_test.go rename to internal/runtime/agent/title_test.go diff --git a/internal/agent/todo_echo.go b/internal/runtime/agent/todo_echo.go similarity index 94% rename from internal/agent/todo_echo.go rename to internal/runtime/agent/todo_echo.go index 85325d7acf..8f7e406c6d 100644 --- a/internal/agent/todo_echo.go +++ b/internal/runtime/agent/todo_echo.go @@ -8,9 +8,9 @@ import ( "context" "encoding/json" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) // emitEagerToolDispatch draws a call's card up front, where a running state is diff --git a/internal/agent/todo_echo_test.go b/internal/runtime/agent/todo_echo_test.go similarity index 96% rename from internal/agent/todo_echo_test.go rename to internal/runtime/agent/todo_echo_test.go index 8a0839968a..5b94d621e8 100644 --- a/internal/agent/todo_echo_test.go +++ b/internal/runtime/agent/todo_echo_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent/testutil" - _ "reasonix/internal/tool/builtin" + _ "reasonix/internal/tools/builtin" ) // planCards counts the todo_write cards a frontend would draw for this run, diff --git a/internal/agent/todo_progress_shadow.go b/internal/runtime/agent/todo_progress_shadow.go similarity index 95% rename from internal/agent/todo_progress_shadow.go rename to internal/runtime/agent/todo_progress_shadow.go index 7692980534..053e3a95b3 100644 --- a/internal/agent/todo_progress_shadow.go +++ b/internal/runtime/agent/todo_progress_shadow.go @@ -1,8 +1,8 @@ package agent import ( - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) // observeTodoTransition records what one task-list write did to the plan. It diff --git a/internal/agent/todo_projection.go b/internal/runtime/agent/todo_projection.go similarity index 97% rename from internal/agent/todo_projection.go rename to internal/runtime/agent/todo_projection.go index 76fd1e7f05..e3cd1b4681 100644 --- a/internal/agent/todo_projection.go +++ b/internal/runtime/agent/todo_projection.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) // todoIdentityNote renders the ids a sign-off must cite. It states whose list diff --git a/internal/agent/todo_projection_test.go b/internal/runtime/agent/todo_projection_test.go similarity index 98% rename from internal/agent/todo_projection_test.go rename to internal/runtime/agent/todo_projection_test.go index 0a47cbab29..3bf9f27fce 100644 --- a/internal/agent/todo_projection_test.go +++ b/internal/runtime/agent/todo_projection_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func planTodos() []evidence.TodoItem { diff --git a/internal/agent/todo_state.go b/internal/runtime/agent/todo_state.go similarity index 98% rename from internal/agent/todo_state.go rename to internal/runtime/agent/todo_state.go index b3d046b418..3efb490d73 100644 --- a/internal/agent/todo_state.go +++ b/internal/runtime/agent/todo_state.go @@ -7,7 +7,7 @@ import ( "encoding/json" "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // SeedTodoState initializes the canonical task list from a host-generated diff --git a/internal/agent/tool_call_context.go b/internal/runtime/agent/tool_call_context.go similarity index 88% rename from internal/agent/tool_call_context.go rename to internal/runtime/agent/tool_call_context.go index 8de15dd3d7..293c378c71 100644 --- a/internal/agent/tool_call_context.go +++ b/internal/runtime/agent/tool_call_context.go @@ -3,13 +3,13 @@ package agent import ( "context" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/instruction" - "reasonix/internal/jobs" - "reasonix/internal/memory" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/instruction" + "reasonix/internal/state/memory" ) // toolCallContext assembles the context one tool call runs under: the host diff --git a/internal/agent/tool_facts.go b/internal/runtime/agent/tool_facts.go similarity index 94% rename from internal/agent/tool_facts.go rename to internal/runtime/agent/tool_facts.go index 230a69bd7f..7e821d1ad5 100644 --- a/internal/agent/tool_facts.go +++ b/internal/runtime/agent/tool_facts.go @@ -2,8 +2,8 @@ package agent import ( - "reasonix/internal/evidence" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // toolFacts reads a resolved tool's own contracts. Callers holding the tool use diff --git a/internal/agent/tool_failure_identity_test.go b/internal/runtime/agent/tool_failure_identity_test.go similarity index 98% rename from internal/agent/tool_failure_identity_test.go rename to internal/runtime/agent/tool_failure_identity_test.go index 87f1a6dd19..2a7d96a1eb 100644 --- a/internal/agent/tool_failure_identity_test.go +++ b/internal/runtime/agent/tool_failure_identity_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // A tool result the host refused carries the host's own identity for it. Only diff --git a/internal/agent/tool_image_aging.go b/internal/runtime/agent/tool_image_aging.go similarity index 97% rename from internal/agent/tool_image_aging.go rename to internal/runtime/agent/tool_image_aging.go index d3d93e1ea8..f4a4383c99 100644 --- a/internal/agent/tool_image_aging.go +++ b/internal/runtime/agent/tool_image_aging.go @@ -6,8 +6,8 @@ import ( "image" "strings" - "reasonix/internal/provider" - "reasonix/internal/visionimage" + "reasonix/internal/contract/provider" + "reasonix/internal/model/visionimage" ) // A tool image answers for the moment it was taken, so a request carries only diff --git a/internal/agent/tool_image_aging_test.go b/internal/runtime/agent/tool_image_aging_test.go similarity index 97% rename from internal/agent/tool_image_aging_test.go rename to internal/runtime/agent/tool_image_aging_test.go index 7eacea7808..3271bdeb59 100644 --- a/internal/agent/tool_image_aging_test.go +++ b/internal/runtime/agent/tool_image_aging_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" - "reasonix/internal/visionimage" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/model/visionimage" ) func pngDataURL(t *testing.T, w, h int) string { diff --git a/internal/agent/tool_output_spill.go b/internal/runtime/agent/tool_output_spill.go similarity index 98% rename from internal/agent/tool_output_spill.go rename to internal/runtime/agent/tool_output_spill.go index 090874cb48..157a0b5cfd 100644 --- a/internal/agent/tool_output_spill.go +++ b/internal/runtime/agent/tool_output_spill.go @@ -8,10 +8,10 @@ import ( "runtime" "strings" - "reasonix/internal/event" - "reasonix/internal/store" - "reasonix/internal/textutil" - "reasonix/internal/tool" + "reasonix/internal/base/textutil" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/state/store" ) // Oversize tool output goes to a file; the context keeps a pointer. A head+tail diff --git a/internal/agent/tool_output_spill_test.go b/internal/runtime/agent/tool_output_spill_test.go similarity index 99% rename from internal/agent/tool_output_spill_test.go rename to internal/runtime/agent/tool_output_spill_test.go index 4a7cad56c3..cb28755cea 100644 --- a/internal/agent/tool_output_spill_test.go +++ b/internal/runtime/agent/tool_output_spill_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" ) const spillMarker = "kept out of context" diff --git a/internal/agent/tool_receipts.go b/internal/runtime/agent/tool_receipts.go similarity index 97% rename from internal/agent/tool_receipts.go rename to internal/runtime/agent/tool_receipts.go index 3acd11360c..aa29b1d6c5 100644 --- a/internal/agent/tool_receipts.go +++ b/internal/runtime/agent/tool_receipts.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "reasonix/internal/evidence" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // recordToolReceipts files the turn-scoped evidence for one executed call: diff --git a/internal/agent/toolimages_test.go b/internal/runtime/agent/toolimages_test.go similarity index 97% rename from internal/agent/toolimages_test.go rename to internal/runtime/agent/toolimages_test.go index 81acf172c7..11f543e549 100644 --- a/internal/agent/toolimages_test.go +++ b/internal/runtime/agent/toolimages_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) // fakeImageTool implements tool.ImageTool: text and images travel on separate diff --git a/internal/agent/transient_tags_test.go b/internal/runtime/agent/transient_tags_test.go similarity index 99% rename from internal/agent/transient_tags_test.go rename to internal/runtime/agent/transient_tags_test.go index 461d908550..657554e352 100644 --- a/internal/agent/transient_tags_test.go +++ b/internal/runtime/agent/transient_tags_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // Every tag the host prepends must strip cleanly, whatever else precedes it. diff --git a/internal/agent/turn_phase.go b/internal/runtime/agent/turn_phase.go similarity index 95% rename from internal/agent/turn_phase.go rename to internal/runtime/agent/turn_phase.go index 7a9287fa77..f759a3d253 100644 --- a/internal/agent/turn_phase.go +++ b/internal/runtime/agent/turn_phase.go @@ -1,10 +1,10 @@ package agent import ( - "reasonix/internal/completion" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/event" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/completion" + "reasonix/internal/runtime/evidence" ) // summaryVerdictOf keeps the summary line and the completion receipt on one diff --git a/internal/agent/turn_phase_test.go b/internal/runtime/agent/turn_phase_test.go similarity index 95% rename from internal/agent/turn_phase_test.go rename to internal/runtime/agent/turn_phase_test.go index f213c4a8a0..ac5f78682f 100644 --- a/internal/agent/turn_phase_test.go +++ b/internal/runtime/agent/turn_phase_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type phaseSink struct { diff --git a/internal/agent/turnruntime.go b/internal/runtime/agent/turnruntime.go similarity index 96% rename from internal/agent/turnruntime.go rename to internal/runtime/agent/turnruntime.go index d4c47423ae..0ef358e4b2 100644 --- a/internal/agent/turnruntime.go +++ b/internal/runtime/agent/turnruntime.go @@ -1,10 +1,10 @@ package agent import ( - "reasonix/internal/completion" - "reasonix/internal/taskpolicy" + "reasonix/internal/runtime/completion" + "reasonix/internal/runtime/taskpolicy" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // turnRuntime is the host state for exactly one Agent.Run. beginRunTurn builds diff --git a/internal/agent/turnruntime_test.go b/internal/runtime/agent/turnruntime_test.go similarity index 100% rename from internal/agent/turnruntime_test.go rename to internal/runtime/agent/turnruntime_test.go diff --git a/internal/agent/upstream_context.go b/internal/runtime/agent/upstream_context.go similarity index 100% rename from internal/agent/upstream_context.go rename to internal/runtime/agent/upstream_context.go diff --git a/internal/agent/upstream_context_test.go b/internal/runtime/agent/upstream_context_test.go similarity index 97% rename from internal/agent/upstream_context_test.go rename to internal/runtime/agent/upstream_context_test.go index b2943f128d..cf09e21d56 100644 --- a/internal/agent/upstream_context_test.go +++ b/internal/runtime/agent/upstream_context_test.go @@ -7,14 +7,14 @@ import ( "sync" "testing" - "reasonix/internal/ablation" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" - "reasonix/internal/agentgraph" + "reasonix/internal/contract/agentgraph" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" "slices" ) diff --git a/internal/agent/usage_accounting_test.go b/internal/runtime/agent/usage_accounting_test.go similarity index 98% rename from internal/agent/usage_accounting_test.go rename to internal/runtime/agent/usage_accounting_test.go index 058b1d2d12..227195a726 100644 --- a/internal/agent/usage_accounting_test.go +++ b/internal/runtime/agent/usage_accounting_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent/testutil" ) type accountingRoundTripFunc func(*http.Request) (*http.Response, error) diff --git a/internal/agent/usage_context.go b/internal/runtime/agent/usage_context.go similarity index 91% rename from internal/agent/usage_context.go rename to internal/runtime/agent/usage_context.go index 7dd0b26750..d6ea483ef1 100644 --- a/internal/agent/usage_context.go +++ b/internal/runtime/agent/usage_context.go @@ -1,6 +1,6 @@ package agent -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // applyLatestContextShape copies the latest single-request shape into Context* // fields for gauges and Desktop rebind telemetry. diff --git a/internal/agent/usage_test.go b/internal/runtime/agent/usage_test.go similarity index 97% rename from internal/agent/usage_test.go rename to internal/runtime/agent/usage_test.go index 7b2e78fbea..a1d39fbf7f 100644 --- a/internal/agent/usage_test.go +++ b/internal/runtime/agent/usage_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // renderUsage drives a Usage event through a fresh TextSink (no renderer) and diff --git a/internal/agent/usecapability.go b/internal/runtime/agent/usecapability.go similarity index 99% rename from internal/agent/usecapability.go rename to internal/runtime/agent/usecapability.go index 0d8fd46913..5f59334aa4 100644 --- a/internal/agent/usecapability.go +++ b/internal/runtime/agent/usecapability.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "reasonix/internal/capability" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/plugin" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" + "reasonix/internal/runtime/capability" ) // MCPCapabilityRuntime is the session-shared MCP substrate: Host, boot specs, diff --git a/internal/agent/usecapability_batching.go b/internal/runtime/agent/usecapability_batching.go similarity index 97% rename from internal/agent/usecapability_batching.go rename to internal/runtime/agent/usecapability_batching.go index f5d761fa77..e3795ef082 100644 --- a/internal/agent/usecapability_batching.go +++ b/internal/runtime/agent/usecapability_batching.go @@ -6,7 +6,7 @@ import ( "encoding/json" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // Sequential answers for whatever this call proxies rather than for the proxy. diff --git a/internal/agent/usecapability_hint.go b/internal/runtime/agent/usecapability_hint.go similarity index 98% rename from internal/agent/usecapability_hint.go rename to internal/runtime/agent/usecapability_hint.go index 2afe8fce6c..2c63cec4ad 100644 --- a/internal/agent/usecapability_hint.go +++ b/internal/runtime/agent/usecapability_hint.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // misplacedArgumentHint reports that a required top-level field was supplied one diff --git a/internal/agent/usecapability_hint_test.go b/internal/runtime/agent/usecapability_hint_test.go similarity index 99% rename from internal/agent/usecapability_hint_test.go rename to internal/runtime/agent/usecapability_hint_test.go index 77abc08171..30a0f759a9 100644 --- a/internal/agent/usecapability_hint_test.go +++ b/internal/runtime/agent/usecapability_hint_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // The fleet call that motivated this: "items" was rejected without the error diff --git a/internal/agent/usecapability_search.go b/internal/runtime/agent/usecapability_search.go similarity index 98% rename from internal/agent/usecapability_search.go rename to internal/runtime/agent/usecapability_search.go index b2b7a2ac54..0006871158 100644 --- a/internal/agent/usecapability_search.go +++ b/internal/runtime/agent/usecapability_search.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "reasonix/internal/capability" - "reasonix/internal/retrieval" + "reasonix/internal/base/retrieval" + "reasonix/internal/runtime/capability" ) type capabilitySearchHit struct { diff --git a/internal/agent/usecapability_search_test.go b/internal/runtime/agent/usecapability_search_test.go similarity index 98% rename from internal/agent/usecapability_search_test.go rename to internal/runtime/agent/usecapability_search_test.go index bf91be2535..b0c0dd67a3 100644 --- a/internal/agent/usecapability_search_test.go +++ b/internal/runtime/agent/usecapability_search_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/capability" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/capability" ) type searchableCapabilityTool struct{ name, description string } diff --git a/internal/agent/usecapability_test.go b/internal/runtime/agent/usecapability_test.go similarity index 97% rename from internal/agent/usecapability_test.go rename to internal/runtime/agent/usecapability_test.go index 7ac2c90d0e..9b7842beae 100644 --- a/internal/agent/usecapability_test.go +++ b/internal/runtime/agent/usecapability_test.go @@ -15,17 +15,17 @@ import ( "testing" "time" - "reasonix/internal/capability" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/mcplaunch" - "reasonix/internal/permission" - "reasonix/internal/plugin" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/mcplaunch" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/evidence" + "reasonix/internal/safety/permission" ) type denyAllGate struct{} @@ -740,46 +740,46 @@ func TestReviewReportRequiresHostReadEvidence(t *testing.T) { led := evidence.NewLedger() ctx := evidence.WithLedger(context.Background(), led) // Claimed paths without any host-observed read: rejected, names the path. - _, err := tl.Execute(ctx, json.RawMessage(`{"kind":"review","verdict":"pass","reviewed_paths":["internal/agent/agent.go"]}`)) - if err == nil || !strings.Contains(err.Error(), "internal/agent/agent.go") { + _, err := tl.Execute(ctx, json.RawMessage(`{"kind":"review","verdict":"pass","reviewed_paths":["internal/runtime/agent/agent.go"]}`)) + if err == nil || !strings.Contains(err.Error(), "internal/runtime/agent/agent.go") { t.Fatalf("expected fake-coverage rejection naming the path, got %v", err) } // A successful read receipt makes the same report acceptable. - led.Record(evidence.ReceiptFromToolCall("read_file", json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, evidence.ToolFacts{ReadOnly: true})) - if _, err := tl.Execute(ctx, json.RawMessage(`{"kind":"review","verdict":"pass","reviewed_paths":["internal/agent/agent.go"]}`)); err != nil { + led.Record(evidence.ReceiptFromToolCall("read_file", json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, evidence.ToolFacts{ReadOnly: true})) + if _, err := tl.Execute(ctx, json.RawMessage(`{"kind":"review","verdict":"pass","reviewed_paths":["internal/runtime/agent/agent.go"]}`)); err != nil { t.Fatalf("host-read path should be accepted: %v", err) } // A shell receipt whose output carried the change counts the same way. led2 := evidence.NewLedger() - diffRec := evidence.ReceiptFromToolCall("bash", json.RawMessage(`{"command":"git diff -- internal/boot/boot.go"}`), true, evidence.ToolFacts{ReadOnly: true}) + diffRec := evidence.ReceiptFromToolCall("bash", json.RawMessage(`{"command":"git diff -- internal/assembly/boot/boot.go"}`), true, evidence.ToolFacts{ReadOnly: true}) diffRec.OutputBytes = 512 - diffRec.Showed = []string{"internal/boot/boot.go"} + diffRec.Showed = []string{"internal/assembly/boot/boot.go"} led2.Record(diffRec) ctx2 := evidence.WithLedger(context.Background(), led2) - if _, err := tl.Execute(ctx2, json.RawMessage(`{"kind":"review","verdict":"pass","reviewed_paths":["internal/boot/boot.go"]}`)); err != nil { + if _, err := tl.Execute(ctx2, json.RawMessage(`{"kind":"review","verdict":"pass","reviewed_paths":["internal/assembly/boot/boot.go"]}`)); err != nil { t.Fatalf("diffed path should be accepted: %v", err) } } func TestReviewReportRejectsNonContentEvidence(t *testing.T) { tl := NewReviewReportTool(reviewGrant(evidence.ReviewKindReview)) - report := json.RawMessage(`{"kind":"review","verdict":"pass","reviewed_paths":["internal/agent/agent.go"]}`) + report := json.RawMessage(`{"kind":"review","verdict":"pass","reviewed_paths":["internal/runtime/agent/agent.go"]}`) // git status mentions the path but never shows content. led := evidence.NewLedger() - led.Record(evidence.ReceiptFromToolCall("bash", json.RawMessage(`{"command":"git status --short -- internal/agent/agent.go"}`), true, evidence.ToolFacts{ReadOnly: true})) + led.Record(evidence.ReceiptFromToolCall("bash", json.RawMessage(`{"command":"git status --short -- internal/runtime/agent/agent.go"}`), true, evidence.ToolFacts{ReadOnly: true})) if _, err := tl.Execute(evidence.WithLedger(context.Background(), led), report); err == nil { t.Fatal("git status must not count as review evidence") } // echo output containing the path shows nothing either. led = evidence.NewLedger() - led.Record(evidence.ReceiptFromToolCall("bash", json.RawMessage(`{"command":"echo internal/agent/agent.go"}`), true, evidence.ToolFacts{ReadOnly: true})) + led.Record(evidence.ReceiptFromToolCall("bash", json.RawMessage(`{"command":"echo internal/runtime/agent/agent.go"}`), true, evidence.ToolFacts{ReadOnly: true})) if _, err := tl.Execute(evidence.WithLedger(context.Background(), led), report); err == nil { t.Fatal("echo must not count as review evidence") } // Writing a file is not reviewing it. led = evidence.NewLedger() - led.Record(evidence.ReceiptFromToolCall("write_file", json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, evidence.ToolFacts{})) + led.Record(evidence.ReceiptFromToolCall("write_file", json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, evidence.ToolFacts{})) if _, err := tl.Execute(evidence.WithLedger(context.Background(), led), report); err == nil { t.Fatal("a write receipt must not count as review evidence") } @@ -793,12 +793,12 @@ func TestReviewReportRejectsNonContentEvidence(t *testing.T) { // own: what it printed may be a count, a status, or another segment's // output. Only the host's record of what the output carried counts. for _, cmd := range []string{ - "cat internal/agent/agent.go", - "cat internal/agent/agent.go >/dev/null", - "git diff --stat -- internal/agent/agent.go", - "cat internal/agent/agent.go | wc -l", - "git diff HEAD~1 -- internal/agent/agent.go && echo done", - "cat internal/agent/agent.go.bak", + "cat internal/runtime/agent/agent.go", + "cat internal/runtime/agent/agent.go >/dev/null", + "git diff --stat -- internal/runtime/agent/agent.go", + "cat internal/runtime/agent/agent.go | wc -l", + "git diff HEAD~1 -- internal/runtime/agent/agent.go && echo done", + "cat internal/runtime/agent/agent.go.bak", } { led := evidence.NewLedger() rec := evidence.ReceiptFromToolCall("bash", json.RawMessage(`{"command":`+strconv.Quote(cmd)+`}`), true, evidence.ToolFacts{ReadOnly: true}) @@ -811,13 +811,13 @@ func TestReviewReportRejectsNonContentEvidence(t *testing.T) { // The same commands, with the host's record that the output carried the // file: the shape never mattered, and a compound one is no longer a wall. for _, cmd := range []string{ - "cat internal/agent/agent.go", - "git diff HEAD~1 -- internal/agent/agent.go && echo done", + "cat internal/runtime/agent/agent.go", + "git diff HEAD~1 -- internal/runtime/agent/agent.go && echo done", } { led := evidence.NewLedger() rec := evidence.ReceiptFromToolCall("bash", json.RawMessage(`{"command":`+strconv.Quote(cmd)+`}`), true, evidence.ToolFacts{ReadOnly: true}) rec.OutputBytes = 512 - rec.Showed = []string{"internal/agent/agent.go"} + rec.Showed = []string{"internal/runtime/agent/agent.go"} led.Record(rec) if _, err := tl.Execute(evidence.WithLedger(context.Background(), led), report); err != nil { t.Fatalf("%q carried the change and should count as review evidence: %v", cmd, err) diff --git a/internal/agent/user_input.go b/internal/runtime/agent/user_input.go similarity index 100% rename from internal/agent/user_input.go rename to internal/runtime/agent/user_input.go diff --git a/internal/agent/user_input_test.go b/internal/runtime/agent/user_input_test.go similarity index 98% rename from internal/agent/user_input_test.go rename to internal/runtime/agent/user_input_test.go index ca5db30efb..70041d6b76 100644 --- a/internal/agent/user_input_test.go +++ b/internal/runtime/agent/user_input_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) type userInputCaptureProvider struct { diff --git a/internal/agent/verification_class_live_test.go b/internal/runtime/agent/verification_class_live_test.go similarity index 96% rename from internal/agent/verification_class_live_test.go rename to internal/runtime/agent/verification_class_live_test.go index 45390e83e5..8647d76908 100644 --- a/internal/agent/verification_class_live_test.go +++ b/internal/runtime/agent/verification_class_live_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/config" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) // Measured against the real triage model: a prompt that reads well is not @@ -58,8 +58,8 @@ var verificationClassCases = []classCase{ // Table says yes and is right. Rejecting any of these would be the // expensive failure: an honest check refused. {"go test ./...", true, "the ordinary case"}, - {"go test -run TestParse ./internal/agent", true, "a named test still checks"}, - {"go test -race ./internal/evidence", true, "a flag that changes how, not whether"}, + {"go test -run TestParse ./internal/runtime/agent", true, "a named test still checks"}, + {"go test -race ./internal/runtime/evidence", true, "a flag that changes how, not whether"}, {"go vet ./...", true, "static analysis is a check"}, {"pytest -q tests/", true, "the ordinary case"}, {"pytest -k parse tests/", true, "a selector that matches still runs"}, diff --git a/internal/agent/visible_final_test.go b/internal/runtime/agent/visible_final_test.go similarity index 98% rename from internal/agent/visible_final_test.go rename to internal/runtime/agent/visible_final_test.go index 63cc337f45..b1fd00199f 100644 --- a/internal/agent/visible_final_test.go +++ b/internal/runtime/agent/visible_final_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" ) func TestRunSubAgentRetriesReasoningOnlyStopForVisibleFinal(t *testing.T) { diff --git a/internal/agent/vision_note_test.go b/internal/runtime/agent/vision_note_test.go similarity index 100% rename from internal/agent/vision_note_test.go rename to internal/runtime/agent/vision_note_test.go diff --git a/internal/agent/vision_routing.go b/internal/runtime/agent/vision_routing.go similarity index 100% rename from internal/agent/vision_routing.go rename to internal/runtime/agent/vision_routing.go diff --git a/internal/agent/vision_routing_test.go b/internal/runtime/agent/vision_routing_test.go similarity index 100% rename from internal/agent/vision_routing_test.go rename to internal/runtime/agent/vision_routing_test.go diff --git a/internal/agent/width.go b/internal/runtime/agent/width.go similarity index 100% rename from internal/agent/width.go rename to internal/runtime/agent/width.go diff --git a/internal/agent/width_test.go b/internal/runtime/agent/width_test.go similarity index 100% rename from internal/agent/width_test.go rename to internal/runtime/agent/width_test.go diff --git a/internal/agent/workspace_block.go b/internal/runtime/agent/workspace_block.go similarity index 100% rename from internal/agent/workspace_block.go rename to internal/runtime/agent/workspace_block.go diff --git a/internal/agent/workspace_block_test.go b/internal/runtime/agent/workspace_block_test.go similarity index 100% rename from internal/agent/workspace_block_test.go rename to internal/runtime/agent/workspace_block_test.go diff --git a/internal/agent/workspace_lease_test.go b/internal/runtime/agent/workspace_lease_test.go similarity index 95% rename from internal/agent/workspace_lease_test.go rename to internal/runtime/agent/workspace_lease_test.go index 1ecd307e6d..d6e7184b8a 100644 --- a/internal/agent/workspace_lease_test.go +++ b/internal/runtime/agent/workspace_lease_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" - "reasonix/internal/workspacelease" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/workspacelease" ) type workspaceLeaseTestTool struct { diff --git a/internal/agent/workspace_mutation.go b/internal/runtime/agent/workspace_mutation.go similarity index 97% rename from internal/agent/workspace_mutation.go rename to internal/runtime/agent/workspace_mutation.go index e1f9f2f9e4..eb20eebb9e 100644 --- a/internal/agent/workspace_mutation.go +++ b/internal/runtime/agent/workspace_mutation.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) type workspaceEffectiveCall struct { diff --git a/internal/agent/workspace_mutation_test.go b/internal/runtime/agent/workspace_mutation_test.go similarity index 96% rename from internal/agent/workspace_mutation_test.go rename to internal/runtime/agent/workspace_mutation_test.go index 6bd535d2f0..cb295d0f9c 100644 --- a/internal/agent/workspace_mutation_test.go +++ b/internal/runtime/agent/workspace_mutation_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/protocol" ) func TestToolBeforeWorkspaceMutationUsesExecutedReplacement(t *testing.T) { diff --git a/internal/agent/write_claims.go b/internal/runtime/agent/write_claims.go similarity index 100% rename from internal/agent/write_claims.go rename to internal/runtime/agent/write_claims.go diff --git a/internal/agent/write_claims_adversarial_test.go b/internal/runtime/agent/write_claims_adversarial_test.go similarity index 98% rename from internal/agent/write_claims_adversarial_test.go rename to internal/runtime/agent/write_claims_adversarial_test.go index d2248ee493..02e3dd46b5 100644 --- a/internal/agent/write_claims_adversarial_test.go +++ b/internal/runtime/agent/write_claims_adversarial_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/evidence" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) // boundWriterFixture builds a workspace with an in-claim directory and an diff --git a/internal/agent/write_claims_test.go b/internal/runtime/agent/write_claims_test.go similarity index 99% rename from internal/agent/write_claims_test.go rename to internal/runtime/agent/write_claims_test.go index 96e580d7ac..cd5d91f4e4 100644 --- a/internal/agent/write_claims_test.go +++ b/internal/runtime/agent/write_claims_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestNormalizeConcurrencyLimitsDefaults(t *testing.T) { diff --git a/internal/agent/write_grant.go b/internal/runtime/agent/write_grant.go similarity index 100% rename from internal/agent/write_grant.go rename to internal/runtime/agent/write_grant.go diff --git a/internal/agent/write_grant_test.go b/internal/runtime/agent/write_grant_test.go similarity index 97% rename from internal/agent/write_grant_test.go rename to internal/runtime/agent/write_grant_test.go index cf7fa7ba20..195f6cc3ce 100644 --- a/internal/agent/write_grant_test.go +++ b/internal/runtime/agent/write_grant_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/permission" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/permission" ) // answerGate records what it was asked and answers with a fixed verdict. diff --git a/internal/agent/zz_probe2_test.go b/internal/runtime/agent/zz_probe2_test.go similarity index 86% rename from internal/agent/zz_probe2_test.go rename to internal/runtime/agent/zz_probe2_test.go index 2b7191e3b2..b5aeccec39 100644 --- a/internal/agent/zz_probe2_test.go +++ b/internal/runtime/agent/zz_probe2_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) type auditProbe2 struct { diff --git a/internal/capability/audit.go b/internal/runtime/capability/audit.go similarity index 100% rename from internal/capability/audit.go rename to internal/runtime/capability/audit.go diff --git a/internal/capability/capability.go b/internal/runtime/capability/capability.go similarity index 99% rename from internal/capability/capability.go rename to internal/runtime/capability/capability.go index 19be93e8ac..7890f70877 100644 --- a/internal/capability/capability.go +++ b/internal/runtime/capability/capability.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" ) type Kind string diff --git a/internal/capability/capability_test.go b/internal/runtime/capability/capability_test.go similarity index 99% rename from internal/capability/capability_test.go rename to internal/runtime/capability/capability_test.go index d34fe2929d..d103e218b2 100644 --- a/internal/capability/capability_test.go +++ b/internal/runtime/capability/capability_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" ) // A skill is routed by the triggers its author declared, never by the host diff --git a/internal/capability/catalog.go b/internal/runtime/capability/catalog.go similarity index 98% rename from internal/capability/catalog.go rename to internal/runtime/capability/catalog.go index dc3253920f..02b1b47276 100644 --- a/internal/capability/catalog.go +++ b/internal/runtime/capability/catalog.go @@ -8,10 +8,10 @@ import ( "sort" "strings" - "reasonix/internal/config" - "reasonix/internal/plugin" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" ) // Profile labels a runtime for diagnostics. It selects nothing: the diff --git a/internal/capability/catalog_cache_test.go b/internal/runtime/capability/catalog_cache_test.go similarity index 98% rename from internal/capability/catalog_cache_test.go rename to internal/runtime/capability/catalog_cache_test.go index 3cb0652edb..755110cef0 100644 --- a/internal/capability/catalog_cache_test.go +++ b/internal/runtime/capability/catalog_cache_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/plugin" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" ) func TestLoadCachedToolsForSpecsHonorsSchemaCacheKey(t *testing.T) { diff --git a/internal/capability/catalog_test.go b/internal/runtime/capability/catalog_test.go similarity index 100% rename from internal/capability/catalog_test.go rename to internal/runtime/capability/catalog_test.go diff --git a/internal/capability/ledger.go b/internal/runtime/capability/ledger.go similarity index 100% rename from internal/capability/ledger.go rename to internal/runtime/capability/ledger.go diff --git a/internal/capability/ledger_test.go b/internal/runtime/capability/ledger_test.go similarity index 100% rename from internal/capability/ledger_test.go rename to internal/runtime/capability/ledger_test.go diff --git a/internal/capability/semantic.go b/internal/runtime/capability/semantic.go similarity index 99% rename from internal/capability/semantic.go rename to internal/runtime/capability/semantic.go index a949ac3d19..44baff7c90 100644 --- a/internal/capability/semantic.go +++ b/internal/runtime/capability/semantic.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) const ( diff --git a/internal/capability/semantic_test.go b/internal/runtime/capability/semantic_test.go similarity index 97% rename from internal/capability/semantic_test.go rename to internal/runtime/capability/semantic_test.go index 26d876d5ca..78486f4db5 100644 --- a/internal/capability/semantic_test.go +++ b/internal/runtime/capability/semantic_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) type fakeStreamProvider struct { diff --git a/internal/completion/claim.go b/internal/runtime/completion/claim.go similarity index 98% rename from internal/completion/claim.go rename to internal/runtime/completion/claim.go index 54273f01bf..fe32944263 100644 --- a/internal/completion/claim.go +++ b/internal/runtime/completion/claim.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strings" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // Claim is the model's own account of the work, as passed to update_goal. It diff --git a/internal/completion/claim_test.go b/internal/runtime/completion/claim_test.go similarity index 99% rename from internal/completion/claim_test.go rename to internal/runtime/completion/claim_test.go index 01255ff89d..f06075a46e 100644 --- a/internal/completion/claim_test.go +++ b/internal/runtime/completion/claim_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) func claimed(status string, completion string) evidence.Receipt { diff --git a/internal/completion/doc.go b/internal/runtime/completion/doc.go similarity index 100% rename from internal/completion/doc.go rename to internal/runtime/completion/doc.go diff --git a/internal/completion/report.go b/internal/runtime/completion/report.go similarity index 99% rename from internal/completion/report.go rename to internal/runtime/completion/report.go index 8cbc8efc24..f8e8ab45d9 100644 --- a/internal/completion/report.go +++ b/internal/runtime/completion/report.go @@ -5,8 +5,8 @@ import ( "slices" "strings" - "reasonix/internal/evidence" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/evidence" ) // Verdict is the report's headline. Partial is terminal: the work is proven diff --git a/internal/completion/report_test.go b/internal/runtime/completion/report_test.go similarity index 99% rename from internal/completion/report_test.go rename to internal/runtime/completion/report_test.go index 95fc5528c0..d5382bda57 100644 --- a/internal/completion/report_test.go +++ b/internal/runtime/completion/report_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/evidence" - "reasonix/internal/taskcontract" + "reasonix/internal/contract/taskcontract" + "reasonix/internal/runtime/evidence" ) func ledgerOf(receipts ...evidence.Receipt) *evidence.Ledger { diff --git a/internal/completion/verification_verdict_test.go b/internal/runtime/completion/verification_verdict_test.go similarity index 98% rename from internal/completion/verification_verdict_test.go rename to internal/runtime/completion/verification_verdict_test.go index f2a8b9c5d9..da1ed7e675 100644 --- a/internal/completion/verification_verdict_test.go +++ b/internal/runtime/completion/verification_verdict_test.go @@ -4,7 +4,7 @@ import ( "slices" "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) // classified is a bash receipt carrying the host's verification verdict, which diff --git a/internal/evidence/background_lease.go b/internal/runtime/evidence/background_lease.go similarity index 100% rename from internal/evidence/background_lease.go rename to internal/runtime/evidence/background_lease.go diff --git a/internal/evidence/baseline.go b/internal/runtime/evidence/baseline.go similarity index 100% rename from internal/evidence/baseline.go rename to internal/runtime/evidence/baseline.go diff --git a/internal/evidence/baseline_test.go b/internal/runtime/evidence/baseline_test.go similarity index 100% rename from internal/evidence/baseline_test.go rename to internal/runtime/evidence/baseline_test.go diff --git a/internal/evidence/child.go b/internal/runtime/evidence/child.go similarity index 100% rename from internal/evidence/child.go rename to internal/runtime/evidence/child.go diff --git a/internal/evidence/child_test.go b/internal/runtime/evidence/child_test.go similarity index 92% rename from internal/evidence/child_test.go rename to internal/runtime/evidence/child_test.go index 0b82359ebe..96efa95b97 100644 --- a/internal/evidence/child_test.go +++ b/internal/runtime/evidence/child_test.go @@ -52,7 +52,7 @@ func TestClassifyMutationRisk(t *testing.T) { } med := []Receipt{ - ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, ToolFacts{WritesNamedPaths: true}), + ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, ToolFacts{WritesNamedPaths: true}), } if got := ClassifyMutationRisk(med, 0, nil); got != RiskMedium { t.Fatalf("prod risk = %s, want medium", got) @@ -61,19 +61,19 @@ func TestClassifyMutationRisk(t *testing.T) { // Sensitivity is declared, never inferred from spelling. Undeclared, a // permission file is ordinary production code; declared, it is High. high := []Receipt{ - ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/permission/gate.go"}`), true, ToolFacts{WritesNamedPaths: true}), + ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/safety/permission/gate.go"}`), true, ToolFacts{WritesNamedPaths: true}), } if got := ClassifyMutationRisk(high, 0, nil); got != RiskMedium { t.Fatalf("undeclared path risk = %s, want medium", got) } - if got := ClassifyMutationRisk(high, 0, []string{"internal/permission/**"}); got != RiskHigh { + if got := ClassifyMutationRisk(high, 0, []string{"internal/safety/permission/**"}); got != RiskHigh { t.Fatalf("declared-sensitive risk = %s, want high", got) } // The retired table matched any path spelling these words. A trace file is // not a data race and a blocked-outcome file is not a lock. - for _, p := range []string{"cmd/e2ebench/phasetrace.go", "internal/agent/conclude_blocked.go"} { + for _, p := range []string{"cmd/e2ebench/phasetrace.go", "internal/runtime/agent/conclude_blocked.go"} { spurious := []Receipt{ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"`+p+`"}`), true, ToolFacts{WritesNamedPaths: true})} - if got := ClassifyMutationRisk(spurious, 0, []string{"internal/permission/**"}); got != RiskMedium { + if got := ClassifyMutationRisk(spurious, 0, []string{"internal/safety/permission/**"}); got != RiskMedium { t.Fatalf("%s risk = %s, want medium (spelling is not sensitivity)", p, got) } } @@ -106,9 +106,9 @@ func TestClassifyMutationRisk(t *testing.T) { // An opaque write alongside a declared-sensitive path still classifies High. opaqueHighPath := []Receipt{ {ToolName: "bash", Success: true, Mutation: true}, - ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/permission/gate.go"}`), true, ToolFacts{WritesNamedPaths: true}), + ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/safety/permission/gate.go"}`), true, ToolFacts{WritesNamedPaths: true}), } - if got := ClassifyMutationRisk(opaqueHighPath, 0, []string{"internal/permission/**"}); got != RiskHigh { + if got := ClassifyMutationRisk(opaqueHighPath, 0, []string{"internal/safety/permission/**"}); got != RiskHigh { t.Fatalf("opaque+declared risk = %s, want high", got) } } @@ -162,7 +162,7 @@ func TestPrivilegedMutationMatchesIdentityNotFragments(t *testing.T) { } ordinary := []string{"plugin_lint", "list_plugins", "edit_file", "multi_edit", "install_sourcemap"} for _, name := range ordinary { - r := ReceiptFromToolCall(name, json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, ToolFacts{}) + r := ReceiptFromToolCall(name, json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, ToolFacts{}) if got := ClassifyMutationRisk([]Receipt{r}, 0, nil); got == RiskHigh { t.Errorf("%s risk = high: a name fragment is not a privileged surface", name) } diff --git a/internal/evidence/cited_check_test.go b/internal/runtime/evidence/cited_check_test.go similarity index 100% rename from internal/evidence/cited_check_test.go rename to internal/runtime/evidence/cited_check_test.go diff --git a/internal/evidence/commandmatch.go b/internal/runtime/evidence/commandmatch.go similarity index 98% rename from internal/evidence/commandmatch.go rename to internal/runtime/evidence/commandmatch.go index 82e973d7cb..832fc95663 100644 --- a/internal/evidence/commandmatch.go +++ b/internal/runtime/evidence/commandmatch.go @@ -3,7 +3,7 @@ package evidence import ( "strings" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // CommandMatches reports whether a cited verification command is proven by a diff --git a/internal/evidence/commandmatch_test.go b/internal/runtime/evidence/commandmatch_test.go similarity index 91% rename from internal/evidence/commandmatch_test.go rename to internal/runtime/evidence/commandmatch_test.go index 4f6401d873..c1d0bf1488 100644 --- a/internal/evidence/commandmatch_test.go +++ b/internal/runtime/evidence/commandmatch_test.go @@ -18,8 +18,8 @@ func TestCommandMatches(t *testing.T) { `test -f test-tools.md && echo "still exists" || echo "deleted"`, true}, {"quoted pipe is not a segment separator", `printf "%s\n" "a | b"`, `printf '%s\n' 'a | b'`, true}, - {"pipe tail dropped", "go test ./internal/tool/... -count=1 -timeout 60s", - "cd /f/Reasonix && go test ./internal/tool/... -count=1 -timeout 60s 2>&1 | tail -10", true}, + {"pipe tail dropped", "go test ./internal/contract/tool/... -count=1 -timeout 60s", + "cd /f/Reasonix && go test ./internal/contract/tool/... -count=1 -timeout 60s 2>&1 | tail -10", true}, {"whitespace collapse", "go test ./...", "go test ./...", true}, {"different command rejected", "go test ./...", "go vet ./...", false}, {"extra cited token rejected", "go test ./a/... ./b/...", "go test ./a/...", false}, diff --git a/internal/evidence/completion_report.go b/internal/runtime/evidence/completion_report.go similarity index 100% rename from internal/evidence/completion_report.go rename to internal/runtime/evidence/completion_report.go diff --git a/internal/evidence/delegation_audit.go b/internal/runtime/evidence/delegation_audit.go similarity index 100% rename from internal/evidence/delegation_audit.go rename to internal/runtime/evidence/delegation_audit.go diff --git a/internal/evidence/evidence.go b/internal/runtime/evidence/evidence.go similarity index 99% rename from internal/evidence/evidence.go rename to internal/runtime/evidence/evidence.go index a6cac20fff..6292b0e2a4 100644 --- a/internal/evidence/evidence.go +++ b/internal/runtime/evidence/evidence.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TodoItem mirrors the todo_write item shape the host needs for step matching. diff --git a/internal/evidence/evidence_test.go b/internal/runtime/evidence/evidence_test.go similarity index 100% rename from internal/evidence/evidence_test.go rename to internal/runtime/evidence/evidence_test.go diff --git a/internal/evidence/goal_progress.go b/internal/runtime/evidence/goal_progress.go similarity index 100% rename from internal/evidence/goal_progress.go rename to internal/runtime/evidence/goal_progress.go diff --git a/internal/evidence/goal_progress_test.go b/internal/runtime/evidence/goal_progress_test.go similarity index 100% rename from internal/evidence/goal_progress_test.go rename to internal/runtime/evidence/goal_progress_test.go diff --git a/internal/evidence/ledger_queries.go b/internal/runtime/evidence/ledger_queries.go similarity index 100% rename from internal/evidence/ledger_queries.go rename to internal/runtime/evidence/ledger_queries.go diff --git a/internal/evidence/meta.go b/internal/runtime/evidence/meta.go similarity index 100% rename from internal/evidence/meta.go rename to internal/runtime/evidence/meta.go diff --git a/internal/evidence/mutation_class.go b/internal/runtime/evidence/mutation_class.go similarity index 97% rename from internal/evidence/mutation_class.go rename to internal/runtime/evidence/mutation_class.go index 010606e850..6a18956f08 100644 --- a/internal/evidence/mutation_class.go +++ b/internal/runtime/evidence/mutation_class.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strings" - "reasonix/internal/shellparse" - "reasonix/internal/shellsafe" + "reasonix/internal/base/shellparse" + "reasonix/internal/safety/shellsafe" ) // Mutation classes say how well the host knows a call changed state. The diff --git a/internal/evidence/mutation_class_test.go b/internal/runtime/evidence/mutation_class_test.go similarity index 98% rename from internal/evidence/mutation_class_test.go rename to internal/runtime/evidence/mutation_class_test.go index 12fb7d3a93..2129e51eb3 100644 --- a/internal/evidence/mutation_class_test.go +++ b/internal/runtime/evidence/mutation_class_test.go @@ -104,7 +104,7 @@ func TestUngradedMutationDoesNotScoreOpaque(t *testing.T) { // prove read-only. The check must not become the change set the reviewer sees. func TestCheckAfterEditKeepsPathScoredRisk(t *testing.T) { receipts := []Receipt{ - ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/agent/agent.go"}`), true, ToolFacts{WritesNamedPaths: true}), + ReceiptFromToolCall("edit_file", json.RawMessage(`{"path":"internal/runtime/agent/agent.go"}`), true, ToolFacts{WritesNamedPaths: true}), ReceiptFromToolCall("bash", json.RawMessage(`{"command":"gofmt -l ."}`), true, ToolFacts{}), } if got := ClassifyMutationRisk(receipts, 0, nil); got != RiskMedium { diff --git a/internal/evidence/mutation_scan.go b/internal/runtime/evidence/mutation_scan.go similarity index 99% rename from internal/evidence/mutation_scan.go rename to internal/runtime/evidence/mutation_scan.go index 668f12fd7b..655c4d36ef 100644 --- a/internal/evidence/mutation_scan.go +++ b/internal/runtime/evidence/mutation_scan.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strings" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // unprovenSegmentLimit bounds the segment a block quotes back. A whole command diff --git a/internal/evidence/mutation_scan_test.go b/internal/runtime/evidence/mutation_scan_test.go similarity index 100% rename from internal/evidence/mutation_scan_test.go rename to internal/runtime/evidence/mutation_scan_test.go diff --git a/internal/evidence/named_paths.go b/internal/runtime/evidence/named_paths.go similarity index 100% rename from internal/evidence/named_paths.go rename to internal/runtime/evidence/named_paths.go diff --git a/internal/evidence/named_paths_test.go b/internal/runtime/evidence/named_paths_test.go similarity index 99% rename from internal/evidence/named_paths_test.go rename to internal/runtime/evidence/named_paths_test.go index 2666cc1a38..b25e44005d 100644 --- a/internal/evidence/named_paths_test.go +++ b/internal/runtime/evidence/named_paths_test.go @@ -5,7 +5,7 @@ import ( "slices" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestNamedPathsReadsLocationsOutOfDelegationProse(t *testing.T) { diff --git a/internal/evidence/obligation.go b/internal/runtime/evidence/obligation.go similarity index 100% rename from internal/evidence/obligation.go rename to internal/runtime/evidence/obligation.go diff --git a/internal/evidence/obligation_test.go b/internal/runtime/evidence/obligation_test.go similarity index 100% rename from internal/evidence/obligation_test.go rename to internal/runtime/evidence/obligation_test.go diff --git a/internal/evidence/opaque_interpreter.go b/internal/runtime/evidence/opaque_interpreter.go similarity index 95% rename from internal/evidence/opaque_interpreter.go rename to internal/runtime/evidence/opaque_interpreter.go index d1efc607f6..aa298aedaf 100644 --- a/internal/evidence/opaque_interpreter.go +++ b/internal/runtime/evidence/opaque_interpreter.go @@ -7,8 +7,8 @@ import ( "encoding/json" "slices" - "reasonix/internal/shellparse" - "reasonix/internal/shellsafe" + "reasonix/internal/base/shellparse" + "reasonix/internal/safety/shellsafe" ) // BashToolCallUsesOpaqueInlineInterpreter reports whether a bash call runs diff --git a/internal/evidence/outcome.go b/internal/runtime/evidence/outcome.go similarity index 99% rename from internal/evidence/outcome.go rename to internal/runtime/evidence/outcome.go index 9ca049115c..877addefd5 100644 --- a/internal/evidence/outcome.go +++ b/internal/runtime/evidence/outcome.go @@ -4,7 +4,7 @@ import ( "path" "strings" - "reasonix/internal/shellsafe" + "reasonix/internal/safety/shellsafe" ) // OutcomeSample decomposes one tool round's receipts by outcome: information diff --git a/internal/evidence/outcome_test.go b/internal/runtime/evidence/outcome_test.go similarity index 100% rename from internal/evidence/outcome_test.go rename to internal/runtime/evidence/outcome_test.go diff --git a/internal/evidence/path_role.go b/internal/runtime/evidence/path_role.go similarity index 98% rename from internal/evidence/path_role.go rename to internal/runtime/evidence/path_role.go index b330ef4a52..33a05eada8 100644 --- a/internal/evidence/path_role.go +++ b/internal/runtime/evidence/path_role.go @@ -3,7 +3,7 @@ package evidence import ( "strings" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // PathRole is what a changed path is to the work product. The zero value is diff --git a/internal/evidence/path_role_test.go b/internal/runtime/evidence/path_role_test.go similarity index 95% rename from internal/evidence/path_role_test.go rename to internal/runtime/evidence/path_role_test.go index 0d57017eec..c76f08b03a 100644 --- a/internal/evidence/path_role_test.go +++ b/internal/runtime/evidence/path_role_test.go @@ -23,7 +23,7 @@ func TestVCSStoreIsNotAChangedPath(t *testing.T) { // An unfamiliar path is code until a rule says otherwise: the zero value must // not be the one that lowers the bar. func TestUnknownPathIsProduction(t *testing.T) { - for _, p := range []string{"internal/agent/agent.go", "src/App.tsx", "Makefile", "weird/thing.zzz"} { + for _, p := range []string{"internal/runtime/agent/agent.go", "src/App.tsx", "Makefile", "weird/thing.zzz"} { if got := ClassifyPath(p); got != PathProduction { t.Errorf("ClassifyPath(%q) = %v, want PathProduction", p, got) } diff --git a/internal/evidence/pipe_status_verdict_test.go b/internal/runtime/evidence/pipe_status_verdict_test.go similarity index 100% rename from internal/evidence/pipe_status_verdict_test.go rename to internal/runtime/evidence/pipe_status_verdict_test.go diff --git a/internal/evidence/progress.go b/internal/runtime/evidence/progress.go similarity index 100% rename from internal/evidence/progress.go rename to internal/runtime/evidence/progress.go diff --git a/internal/evidence/progress_test.go b/internal/runtime/evidence/progress_test.go similarity index 100% rename from internal/evidence/progress_test.go rename to internal/runtime/evidence/progress_test.go diff --git a/internal/evidence/readiness_audit.go b/internal/runtime/evidence/readiness_audit.go similarity index 100% rename from internal/evidence/readiness_audit.go rename to internal/runtime/evidence/readiness_audit.go diff --git a/internal/evidence/readiness_test.go b/internal/runtime/evidence/readiness_test.go similarity index 100% rename from internal/evidence/readiness_test.go rename to internal/runtime/evidence/readiness_test.go diff --git a/internal/evidence/receipt.go b/internal/runtime/evidence/receipt.go similarity index 100% rename from internal/evidence/receipt.go rename to internal/runtime/evidence/receipt.go diff --git a/internal/evidence/render.go b/internal/runtime/evidence/render.go similarity index 100% rename from internal/evidence/render.go rename to internal/runtime/evidence/render.go diff --git a/internal/evidence/render_test.go b/internal/runtime/evidence/render_test.go similarity index 100% rename from internal/evidence/render_test.go rename to internal/runtime/evidence/render_test.go diff --git a/internal/evidence/review_authority.go b/internal/runtime/evidence/review_authority.go similarity index 100% rename from internal/evidence/review_authority.go rename to internal/runtime/evidence/review_authority.go diff --git a/internal/evidence/review_authority_test.go b/internal/runtime/evidence/review_authority_test.go similarity index 100% rename from internal/evidence/review_authority_test.go rename to internal/runtime/evidence/review_authority_test.go diff --git a/internal/evidence/review_report.go b/internal/runtime/evidence/review_report.go similarity index 100% rename from internal/evidence/review_report.go rename to internal/runtime/evidence/review_report.go diff --git a/internal/evidence/risk.go b/internal/runtime/evidence/risk.go similarity index 99% rename from internal/evidence/risk.go rename to internal/runtime/evidence/risk.go index 2889d3f03d..05096781fd 100644 --- a/internal/evidence/risk.go +++ b/internal/runtime/evidence/risk.go @@ -4,7 +4,7 @@ import ( "slices" "strings" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // RiskLevel classifies the latest post-mutation change set for adaptive review. diff --git a/internal/evidence/shell_contract_test.go b/internal/runtime/evidence/shell_contract_test.go similarity index 100% rename from internal/evidence/shell_contract_test.go rename to internal/runtime/evidence/shell_contract_test.go diff --git a/internal/evidence/shown.go b/internal/runtime/evidence/shown.go similarity index 100% rename from internal/evidence/shown.go rename to internal/runtime/evidence/shown.go diff --git a/internal/evidence/shown_test.go b/internal/runtime/evidence/shown_test.go similarity index 100% rename from internal/evidence/shown_test.go rename to internal/runtime/evidence/shown_test.go diff --git a/internal/evidence/test_criteria.go b/internal/runtime/evidence/test_criteria.go similarity index 100% rename from internal/evidence/test_criteria.go rename to internal/runtime/evidence/test_criteria.go diff --git a/internal/evidence/test_criteria_test.go b/internal/runtime/evidence/test_criteria_test.go similarity index 100% rename from internal/evidence/test_criteria_test.go rename to internal/runtime/evidence/test_criteria_test.go diff --git a/internal/evidence/testcriteria.go b/internal/runtime/evidence/testcriteria.go similarity index 100% rename from internal/evidence/testcriteria.go rename to internal/runtime/evidence/testcriteria.go diff --git a/internal/evidence/testcriteria_test.go b/internal/runtime/evidence/testcriteria_test.go similarity index 99% rename from internal/evidence/testcriteria_test.go rename to internal/runtime/evidence/testcriteria_test.go index 94d406232a..df0123babd 100644 --- a/internal/evidence/testcriteria_test.go +++ b/internal/runtime/evidence/testcriteria_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) const ( diff --git a/internal/evidence/todo_identity.go b/internal/runtime/evidence/todo_identity.go similarity index 100% rename from internal/evidence/todo_identity.go rename to internal/runtime/evidence/todo_identity.go diff --git a/internal/evidence/todo_progress.go b/internal/runtime/evidence/todo_progress.go similarity index 100% rename from internal/evidence/todo_progress.go rename to internal/runtime/evidence/todo_progress.go diff --git a/internal/evidence/todo_progress_test.go b/internal/runtime/evidence/todo_progress_test.go similarity index 100% rename from internal/evidence/todo_progress_test.go rename to internal/runtime/evidence/todo_progress_test.go diff --git a/internal/evidence/todos.go b/internal/runtime/evidence/todos.go similarity index 100% rename from internal/evidence/todos.go rename to internal/runtime/evidence/todos.go diff --git a/internal/evidence/tool_facts.go b/internal/runtime/evidence/tool_facts.go similarity index 100% rename from internal/evidence/tool_facts.go rename to internal/runtime/evidence/tool_facts.go diff --git a/internal/evidence/user_gate.go b/internal/runtime/evidence/user_gate.go similarity index 100% rename from internal/evidence/user_gate.go rename to internal/runtime/evidence/user_gate.go diff --git a/internal/evidence/verification_command.go b/internal/runtime/evidence/verification_command.go similarity index 99% rename from internal/evidence/verification_command.go rename to internal/runtime/evidence/verification_command.go index e0c3b50e37..e0add93ae1 100644 --- a/internal/evidence/verification_command.go +++ b/internal/runtime/evidence/verification_command.go @@ -10,8 +10,8 @@ import ( "slices" "strings" - "reasonix/internal/shellparse" - "reasonix/internal/shellsafe" + "reasonix/internal/base/shellparse" + "reasonix/internal/safety/shellsafe" ) // BashToolCallMixesMutationAndVerification reports whether a bash call combines diff --git a/internal/evidence/verification_contract.go b/internal/runtime/evidence/verification_contract.go similarity index 100% rename from internal/evidence/verification_contract.go rename to internal/runtime/evidence/verification_contract.go diff --git a/internal/evidence/verification_exit.go b/internal/runtime/evidence/verification_exit.go similarity index 99% rename from internal/evidence/verification_exit.go rename to internal/runtime/evidence/verification_exit.go index db521b4409..14ffe8094f 100644 --- a/internal/evidence/verification_exit.go +++ b/internal/runtime/evidence/verification_exit.go @@ -5,8 +5,8 @@ import ( "slices" "strings" - "reasonix/internal/shellparse" - "reasonix/internal/shellsafe" + "reasonix/internal/base/shellparse" + "reasonix/internal/safety/shellsafe" ) // PipeStatusCanDecideVerification reports whether per-stage exit statuses could diff --git a/internal/evidence/verification_exit_test.go b/internal/runtime/evidence/verification_exit_test.go similarity index 100% rename from internal/evidence/verification_exit_test.go rename to internal/runtime/evidence/verification_exit_test.go diff --git a/internal/evidence/verification_summary_test.go b/internal/runtime/evidence/verification_summary_test.go similarity index 100% rename from internal/evidence/verification_summary_test.go rename to internal/runtime/evidence/verification_summary_test.go diff --git a/internal/evidence/whole_command_exit_test.go b/internal/runtime/evidence/whole_command_exit_test.go similarity index 100% rename from internal/evidence/whole_command_exit_test.go rename to internal/runtime/evidence/whole_command_exit_test.go diff --git a/internal/goaleval/evaluator.go b/internal/runtime/goaleval/evaluator.go similarity index 98% rename from internal/goaleval/evaluator.go rename to internal/runtime/goaleval/evaluator.go index d4c131d1d3..229ad1fe5c 100644 --- a/internal/goaleval/evaluator.go +++ b/internal/runtime/goaleval/evaluator.go @@ -16,10 +16,10 @@ import ( "sync" "time" - "reasonix/internal/boundedllm" - "reasonix/internal/event" - "reasonix/internal/nilutil" - "reasonix/internal/provider" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/boundedllm" ) // PolicyPrompt is the fixed Goal evaluator system prompt. After this ships it diff --git a/internal/goaleval/evaluator_test.go b/internal/runtime/goaleval/evaluator_test.go similarity index 98% rename from internal/goaleval/evaluator_test.go rename to internal/runtime/goaleval/evaluator_test.go index 82c952e980..d94b7118c2 100644 --- a/internal/goaleval/evaluator_test.go +++ b/internal/runtime/goaleval/evaluator_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) type scriptedProvider struct { diff --git a/internal/jobs/artifacts.go b/internal/runtime/jobs/artifacts.go similarity index 98% rename from internal/jobs/artifacts.go rename to internal/runtime/jobs/artifacts.go index 1ef40aee24..a0e4ab76db 100644 --- a/internal/jobs/artifacts.go +++ b/internal/runtime/jobs/artifacts.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "reasonix/internal/evidence" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/store" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/store" ) // jobTimes is the job's timeline in epoch milliseconds. activity is what stall diff --git a/internal/jobs/artifacts_test.go b/internal/runtime/jobs/artifacts_test.go similarity index 98% rename from internal/jobs/artifacts_test.go rename to internal/runtime/jobs/artifacts_test.go index 62736b5690..c116ede6e4 100644 --- a/internal/jobs/artifacts_test.go +++ b/internal/runtime/jobs/artifacts_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) func TestCompletedJobPersistsOutputAndReleasesMemory(t *testing.T) { @@ -525,11 +525,11 @@ func TestTaskMutationEvidencePersistsWithoutSensitiveReceiptData(t *testing.T) { PublishEvidence(ctx, evidence.ChildEvidenceSummary{Receipts: []evidence.Receipt{ { ToolName: "write_file", - Args: json.RawMessage(`{"path":"internal/agent/task.go","content":"` + secret + `"}`), + Args: json.RawMessage(`{"path":"internal/runtime/agent/task.go","content":"` + secret + `"}`), Success: true, Write: true, Mutation: true, - Paths: []string{"internal/agent/task.go"}, + Paths: []string{"internal/runtime/agent/task.go"}, }, { ToolName: "bash", @@ -553,7 +553,7 @@ func TestTaskMutationEvidencePersistsWithoutSensitiveReceiptData(t *testing.T) { t.Fatalf("job metadata persisted sensitive receipt data %q:\n%s", leaked, text) } } - for _, want := range []string{`"mutationEvidenceVersion": 1`, `"risk": "medium"`, `"internal/agent/task.go"`} { + for _, want := range []string{`"mutationEvidenceVersion": 1`, `"risk": "medium"`, `"internal/runtime/agent/task.go"`} { if !strings.Contains(text, want) { t.Fatalf("job metadata missing %q:\n%s", want, text) } @@ -570,8 +570,8 @@ func TestTaskMutationEvidencePersistsWithoutSensitiveReceiptData(t *testing.T) { if !receipt.Success || !receipt.Mutation || !receipt.Write || receipt.ToolName != recoveredBackgroundTaskToolName { t.Fatalf("restored receipt = %+v, want successful recovered mutation", receipt) } - if len(receipt.Paths) != 1 || filepath.ToSlash(receipt.Paths[0]) != "internal/agent/task.go" { - t.Fatalf("restored paths = %v, want internal/agent/task.go", receipt.Paths) + if len(receipt.Paths) != 1 || filepath.ToSlash(receipt.Paths[0]) != "internal/runtime/agent/task.go" { + t.Fatalf("restored paths = %v, want internal/runtime/agent/task.go", receipt.Paths) } if len(receipt.Args) != 0 || receipt.Command != "" || receipt.Read { t.Fatalf("restored receipt retained stale sign-off data: %+v", receipt) diff --git a/internal/jobs/completion.go b/internal/runtime/jobs/completion.go similarity index 98% rename from internal/jobs/completion.go rename to internal/runtime/jobs/completion.go index 53702e05bd..a0bb3f4f0e 100644 --- a/internal/jobs/completion.go +++ b/internal/runtime/jobs/completion.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/event" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" ) // completionEventVersion is the identity's schema suffix. A reader that stores diff --git a/internal/jobs/completion_test.go b/internal/runtime/jobs/completion_test.go similarity index 99% rename from internal/jobs/completion_test.go rename to internal/runtime/jobs/completion_test.go index 4061551c70..81c6944bee 100644 --- a/internal/jobs/completion_test.go +++ b/internal/runtime/jobs/completion_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) type recordingObserver struct { diff --git a/internal/jobs/concurrency_stress_test.go b/internal/runtime/jobs/concurrency_stress_test.go similarity index 96% rename from internal/jobs/concurrency_stress_test.go rename to internal/runtime/jobs/concurrency_stress_test.go index 7a08b45172..46023b197f 100644 --- a/internal/jobs/concurrency_stress_test.go +++ b/internal/runtime/jobs/concurrency_stress_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // TestManagerConcurrentAccess hammers every public Manager method from many diff --git a/internal/jobs/context_isolation_test.go b/internal/runtime/jobs/context_isolation_test.go similarity index 100% rename from internal/jobs/context_isolation_test.go rename to internal/runtime/jobs/context_isolation_test.go diff --git a/internal/jobs/jobs.go b/internal/runtime/jobs/jobs.go similarity index 99% rename from internal/jobs/jobs.go rename to internal/runtime/jobs/jobs.go index cc4eb45cae..91f41a748f 100644 --- a/internal/jobs/jobs.go +++ b/internal/runtime/jobs/jobs.go @@ -27,9 +27,9 @@ import ( "sync/atomic" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) var renamePath = os.Rename @@ -189,7 +189,7 @@ type completion struct { type Option func(*Manager) // TaskRecorder observes background-job lifecycle for task monitoring. The -// store-backed write side lives outside jobs (typically internal/taskmonitor); +// store-backed write side lives outside jobs (typically internal/runtime/taskmonitor); // jobs only calls the hooks. RecordStart runs on the caller's goroutine, // RecordDone on the job's own goroutine — implementations must be safe for // concurrent use and must not block or fail the job pipeline (best-effort). diff --git a/internal/jobs/jobs_extra_test.go b/internal/runtime/jobs/jobs_extra_test.go similarity index 99% rename from internal/jobs/jobs_extra_test.go rename to internal/runtime/jobs/jobs_extra_test.go index e0f746f683..81f55c844b 100644 --- a/internal/jobs/jobs_extra_test.go +++ b/internal/runtime/jobs/jobs_extra_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) type typedNilJobSink struct{} diff --git a/internal/jobs/jobs_recorder_test.go b/internal/runtime/jobs/jobs_recorder_test.go similarity index 99% rename from internal/jobs/jobs_recorder_test.go rename to internal/runtime/jobs/jobs_recorder_test.go index 20b9a8d855..7b3f411659 100644 --- a/internal/jobs/jobs_recorder_test.go +++ b/internal/runtime/jobs/jobs_recorder_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) func newManagerWithRecorder(r TaskRecorder) *Manager { diff --git a/internal/jobs/jobs_security_test.go b/internal/runtime/jobs/jobs_security_test.go similarity index 98% rename from internal/jobs/jobs_security_test.go rename to internal/runtime/jobs/jobs_security_test.go index 852fb1a0a0..cc3a833789 100644 --- a/internal/jobs/jobs_security_test.go +++ b/internal/runtime/jobs/jobs_security_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/state/store" ) // TestValidatePathSegment exhaustively covers the segment validator that guards diff --git a/internal/jobs/jobs_sessionpath_test.go b/internal/runtime/jobs/jobs_sessionpath_test.go similarity index 98% rename from internal/jobs/jobs_sessionpath_test.go rename to internal/runtime/jobs/jobs_sessionpath_test.go index bf08f6b072..8a55968854 100644 --- a/internal/jobs/jobs_sessionpath_test.go +++ b/internal/runtime/jobs/jobs_sessionpath_test.go @@ -9,9 +9,9 @@ import ( "sync" "testing" - "reasonix/internal/event" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/state/store" ) // captureSink records every event the manager emits so tests can assert that diff --git a/internal/jobs/jobs_test.go b/internal/runtime/jobs/jobs_test.go similarity index 99% rename from internal/jobs/jobs_test.go rename to internal/runtime/jobs/jobs_test.go index f84e37e8bb..a8bae8a8cf 100644 --- a/internal/jobs/jobs_test.go +++ b/internal/runtime/jobs/jobs_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) type recordingSink struct { diff --git a/internal/jobs/main_test.go b/internal/runtime/jobs/main_test.go similarity index 100% rename from internal/jobs/main_test.go rename to internal/runtime/jobs/main_test.go diff --git a/internal/jobs/output_result_test.go b/internal/runtime/jobs/output_result_test.go similarity index 96% rename from internal/jobs/output_result_test.go rename to internal/runtime/jobs/output_result_test.go index 9793954d79..4677443443 100644 --- a/internal/jobs/output_result_test.go +++ b/internal/runtime/jobs/output_result_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // TestOutputSurfacesResultForBufferlessJob probes a task-style job: its run func diff --git a/internal/jobs/progress.go b/internal/runtime/jobs/progress.go similarity index 100% rename from internal/jobs/progress.go rename to internal/runtime/jobs/progress.go diff --git a/internal/jobs/watch.go b/internal/runtime/jobs/watch.go similarity index 100% rename from internal/jobs/watch.go rename to internal/runtime/jobs/watch.go diff --git a/internal/jobs/watch_test.go b/internal/runtime/jobs/watch_test.go similarity index 99% rename from internal/jobs/watch_test.go rename to internal/runtime/jobs/watch_test.go index 1c7ffc4868..fbbcafe7a9 100644 --- a/internal/jobs/watch_test.go +++ b/internal/runtime/jobs/watch_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // A long job can be waited on once instead of polled, if the caller can say diff --git a/internal/outputstyle/outputstyle.go b/internal/runtime/outputstyle/outputstyle.go similarity index 98% rename from internal/outputstyle/outputstyle.go rename to internal/runtime/outputstyle/outputstyle.go index 29c5324a36..1a2c380e09 100644 --- a/internal/outputstyle/outputstyle.go +++ b/internal/runtime/outputstyle/outputstyle.go @@ -12,8 +12,8 @@ import ( "sort" "strings" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/frontmatter" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/frontmatter" ) // OutputStyle is one selectable persona. Body is appended to the system prompt diff --git a/internal/outputstyle/outputstyle_test.go b/internal/runtime/outputstyle/outputstyle_test.go similarity index 97% rename from internal/outputstyle/outputstyle_test.go rename to internal/runtime/outputstyle/outputstyle_test.go index 7b83485dc6..0d3572e621 100644 --- a/internal/outputstyle/outputstyle_test.go +++ b/internal/runtime/outputstyle/outputstyle_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func TestResolveBuiltin(t *testing.T) { diff --git a/internal/promptrefine/refine.go b/internal/runtime/promptrefine/refine.go similarity index 97% rename from internal/promptrefine/refine.go rename to internal/runtime/promptrefine/refine.go index 3e83e66129..f5704bbc7f 100644 --- a/internal/promptrefine/refine.go +++ b/internal/runtime/promptrefine/refine.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "reasonix/internal/boundedllm" - "reasonix/internal/event" - "reasonix/internal/nilutil" - "reasonix/internal/provider" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/boundedllm" ) var ( diff --git a/internal/promptrefine/refine_test.go b/internal/runtime/promptrefine/refine_test.go similarity index 97% rename from internal/promptrefine/refine_test.go rename to internal/runtime/promptrefine/refine_test.go index 54bf7a8434..a55fb5d858 100644 --- a/internal/promptrefine/refine_test.go +++ b/internal/runtime/promptrefine/refine_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) type fakeProvider struct { diff --git a/internal/recovery/cache_shape_test.go b/internal/runtime/recovery/cache_shape_test.go similarity index 94% rename from internal/recovery/cache_shape_test.go rename to internal/runtime/recovery/cache_shape_test.go index 9499feb002..b1a2e3175e 100644 --- a/internal/recovery/cache_shape_test.go +++ b/internal/runtime/recovery/cache_shape_test.go @@ -5,10 +5,10 @@ import ( "encoding/json" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/recovery" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/recovery" ) // TestRecoveryWiringPreservesSuccessPathCacheShape pins the product rule that diff --git a/internal/recovery/decision.go b/internal/runtime/recovery/decision.go similarity index 100% rename from internal/recovery/decision.go rename to internal/runtime/recovery/decision.go diff --git a/internal/recovery/decision_test.go b/internal/runtime/recovery/decision_test.go similarity index 100% rename from internal/recovery/decision_test.go rename to internal/runtime/recovery/decision_test.go diff --git a/internal/recovery/fingerprint.go b/internal/runtime/recovery/fingerprint.go similarity index 100% rename from internal/recovery/fingerprint.go rename to internal/runtime/recovery/fingerprint.go diff --git a/internal/recovery/gate.go b/internal/runtime/recovery/gate.go similarity index 99% rename from internal/recovery/gate.go rename to internal/runtime/recovery/gate.go index 25a4d52595..e4507cc22c 100644 --- a/internal/recovery/gate.go +++ b/internal/runtime/recovery/gate.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // ModeProvider reports the current tool-approval mode (ask|auto|yolo). diff --git a/internal/recovery/gate_restore.go b/internal/runtime/recovery/gate_restore.go similarity index 100% rename from internal/recovery/gate_restore.go rename to internal/runtime/recovery/gate_restore.go diff --git a/internal/recovery/gate_test.go b/internal/runtime/recovery/gate_test.go similarity index 100% rename from internal/recovery/gate_test.go rename to internal/runtime/recovery/gate_test.go diff --git a/internal/recovery/persist.go b/internal/runtime/recovery/persist.go similarity index 91% rename from internal/recovery/persist.go rename to internal/runtime/recovery/persist.go index 31dec296d6..9bf54441c1 100644 --- a/internal/recovery/persist.go +++ b/internal/runtime/recovery/persist.go @@ -4,9 +4,9 @@ import ( "encoding/json" "os" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/state/store" ) // PathFor returns the recovery state sidecar for a main session path. diff --git a/internal/recovery/persist_test.go b/internal/runtime/recovery/persist_test.go similarity index 99% rename from internal/recovery/persist_test.go rename to internal/runtime/recovery/persist_test.go index 6af975931f..863e24fcb1 100644 --- a/internal/recovery/persist_test.go +++ b/internal/runtime/recovery/persist_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestTaskScopePersistenceIsBackwardCompatible(t *testing.T) { diff --git a/internal/recovery/reviewer.go b/internal/runtime/recovery/reviewer.go similarity index 98% rename from internal/recovery/reviewer.go rename to internal/runtime/recovery/reviewer.go index 3df437d5d0..d8a3570239 100644 --- a/internal/recovery/reviewer.go +++ b/internal/runtime/recovery/reviewer.go @@ -9,10 +9,10 @@ import ( "time" "unicode/utf8" - "reasonix/internal/boundedllm" - "reasonix/internal/event" - "reasonix/internal/nilutil" - "reasonix/internal/provider" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/boundedllm" ) // PolicyPrompt is the fixed Auto Guard reviewer system prompt. After this PR diff --git a/internal/recovery/reviewer_test.go b/internal/runtime/recovery/reviewer_test.go similarity index 99% rename from internal/recovery/reviewer_test.go rename to internal/runtime/recovery/reviewer_test.go index b14fffd5cd..a83d2ab537 100644 --- a/internal/recovery/reviewer_test.go +++ b/internal/runtime/recovery/reviewer_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) type captureProvider struct { diff --git a/internal/recovery/rules.go b/internal/runtime/recovery/rules.go similarity index 99% rename from internal/recovery/rules.go rename to internal/runtime/recovery/rules.go index 96192821f1..2c90f01f8c 100644 --- a/internal/recovery/rules.go +++ b/internal/runtime/recovery/rules.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/shellparse" - "reasonix/internal/shellsafe" + "reasonix/internal/base/shellparse" + "reasonix/internal/safety/shellsafe" ) // QualifyingFailure reports whether an observation should arm the checkpoint. diff --git a/internal/recovery/state.go b/internal/runtime/recovery/state.go similarity index 100% rename from internal/recovery/state.go rename to internal/runtime/recovery/state.go diff --git a/internal/recovery/types.go b/internal/runtime/recovery/types.go similarity index 99% rename from internal/recovery/types.go rename to internal/runtime/recovery/types.go index 8fca7cdab2..dc654f59a8 100644 --- a/internal/recovery/types.go +++ b/internal/runtime/recovery/types.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "reasonix/internal/agent" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" ) // Phase is a derived view of recovery progress for compatibility snapshots. diff --git a/internal/taskmonitor/control.go b/internal/runtime/taskmonitor/control.go similarity index 100% rename from internal/taskmonitor/control.go rename to internal/runtime/taskmonitor/control.go diff --git a/internal/taskmonitor/control_test.go b/internal/runtime/taskmonitor/control_test.go similarity index 99% rename from internal/taskmonitor/control_test.go rename to internal/runtime/taskmonitor/control_test.go index 3286a8e375..5ffe2d0d45 100644 --- a/internal/taskmonitor/control_test.go +++ b/internal/runtime/taskmonitor/control_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestControlService_StopTask(t *testing.T) { diff --git a/internal/taskmonitor/event_tail.go b/internal/runtime/taskmonitor/event_tail.go similarity index 100% rename from internal/taskmonitor/event_tail.go rename to internal/runtime/taskmonitor/event_tail.go diff --git a/internal/taskmonitor/event_tail_test.go b/internal/runtime/taskmonitor/event_tail_test.go similarity index 97% rename from internal/taskmonitor/event_tail_test.go rename to internal/runtime/taskmonitor/event_tail_test.go index a5feabffbe..2623f9c1d7 100644 --- a/internal/taskmonitor/event_tail_test.go +++ b/internal/runtime/taskmonitor/event_tail_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestReadEventTailKeepsIncompleteLineForRetry(t *testing.T) { diff --git a/internal/taskmonitor/filelock_unix.go b/internal/runtime/taskmonitor/filelock_unix.go similarity index 100% rename from internal/taskmonitor/filelock_unix.go rename to internal/runtime/taskmonitor/filelock_unix.go diff --git a/internal/taskmonitor/filelock_windows.go b/internal/runtime/taskmonitor/filelock_windows.go similarity index 100% rename from internal/taskmonitor/filelock_windows.go rename to internal/runtime/taskmonitor/filelock_windows.go diff --git a/internal/taskmonitor/jsonstore.go b/internal/runtime/taskmonitor/jsonstore.go similarity index 99% rename from internal/taskmonitor/jsonstore.go rename to internal/runtime/taskmonitor/jsonstore.go index 020b25916f..2b715dd2b1 100644 --- a/internal/taskmonitor/jsonstore.go +++ b/internal/runtime/taskmonitor/jsonstore.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // FileStore is a Store backed by a JSON file tree under a project-local diff --git a/internal/taskmonitor/jsonstore_test.go b/internal/runtime/taskmonitor/jsonstore_test.go similarity index 99% rename from internal/taskmonitor/jsonstore_test.go rename to internal/runtime/taskmonitor/jsonstore_test.go index 676e134530..e9269476cd 100644 --- a/internal/taskmonitor/jsonstore_test.go +++ b/internal/runtime/taskmonitor/jsonstore_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestFileStore_ListTasks_EmptyDir(t *testing.T) { diff --git a/internal/taskmonitor/memory.go b/internal/runtime/taskmonitor/memory.go similarity index 100% rename from internal/taskmonitor/memory.go rename to internal/runtime/taskmonitor/memory.go diff --git a/internal/taskmonitor/model.go b/internal/runtime/taskmonitor/model.go similarity index 100% rename from internal/taskmonitor/model.go rename to internal/runtime/taskmonitor/model.go diff --git a/internal/taskmonitor/model_test.go b/internal/runtime/taskmonitor/model_test.go similarity index 100% rename from internal/taskmonitor/model_test.go rename to internal/runtime/taskmonitor/model_test.go diff --git a/internal/taskmonitor/projection_sink_test.go b/internal/runtime/taskmonitor/projection_sink_test.go similarity index 97% rename from internal/taskmonitor/projection_sink_test.go rename to internal/runtime/taskmonitor/projection_sink_test.go index aa6facb072..dc598a8e59 100644 --- a/internal/taskmonitor/projection_sink_test.go +++ b/internal/runtime/taskmonitor/projection_sink_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) type reentrantProjectionSink struct { diff --git a/internal/taskmonitor/recorder.go b/internal/runtime/taskmonitor/recorder.go similarity index 99% rename from internal/taskmonitor/recorder.go rename to internal/runtime/taskmonitor/recorder.go index a5914e06bf..d29220afc3 100644 --- a/internal/taskmonitor/recorder.go +++ b/internal/runtime/taskmonitor/recorder.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "reasonix/internal/jobs" + "reasonix/internal/runtime/jobs" ) // TaskRecorder bridges jobs.Manager lifecycle events into the Task Store. It diff --git a/internal/taskmonitor/recorder_test.go b/internal/runtime/taskmonitor/recorder_test.go similarity index 99% rename from internal/taskmonitor/recorder_test.go rename to internal/runtime/taskmonitor/recorder_test.go index 46299d7ee1..832965dd25 100644 --- a/internal/taskmonitor/recorder_test.go +++ b/internal/runtime/taskmonitor/recorder_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "reasonix/internal/jobs" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/jobs" ) func newRecorderForTest(t *testing.T, projectDir string) (*TaskRecorder, *FileStore) { diff --git a/internal/taskmonitor/store.go b/internal/runtime/taskmonitor/store.go similarity index 100% rename from internal/taskmonitor/store.go rename to internal/runtime/taskmonitor/store.go diff --git a/internal/taskmonitor/tmux.go b/internal/runtime/taskmonitor/tmux.go similarity index 100% rename from internal/taskmonitor/tmux.go rename to internal/runtime/taskmonitor/tmux.go diff --git a/internal/taskmonitor/tmux_test.go b/internal/runtime/taskmonitor/tmux_test.go similarity index 99% rename from internal/taskmonitor/tmux_test.go rename to internal/runtime/taskmonitor/tmux_test.go index d917bcabc2..8d6e8fc0b8 100644 --- a/internal/taskmonitor/tmux_test.go +++ b/internal/runtime/taskmonitor/tmux_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) type tmuxMock struct { diff --git a/internal/taskpolicy/context.go b/internal/runtime/taskpolicy/context.go similarity index 100% rename from internal/taskpolicy/context.go rename to internal/runtime/taskpolicy/context.go diff --git a/internal/taskpolicy/policy.go b/internal/runtime/taskpolicy/policy.go similarity index 98% rename from internal/taskpolicy/policy.go rename to internal/runtime/taskpolicy/policy.go index 5c7be7ac2b..1371d37e19 100644 --- a/internal/taskpolicy/policy.go +++ b/internal/runtime/taskpolicy/policy.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "reasonix/internal/agentpreset" + "reasonix/internal/contract/agentpreset" ) // PolicyVersion is the diagnostic version stamped on every TaskPolicy. diff --git a/internal/taskpolicy/policy_test.go b/internal/runtime/taskpolicy/policy_test.go similarity index 98% rename from internal/taskpolicy/policy_test.go rename to internal/runtime/taskpolicy/policy_test.go index 12a20617a4..359e12be7c 100644 --- a/internal/taskpolicy/policy_test.go +++ b/internal/runtime/taskpolicy/policy_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/agentpreset" + "reasonix/internal/contract/agentpreset" ) func TestDeriveVerificationFollowsPreset(t *testing.T) { diff --git a/internal/guardian/guardian.go b/internal/safety/guardian/guardian.go similarity index 98% rename from internal/guardian/guardian.go rename to internal/safety/guardian/guardian.go index e8de9796a6..ec3357d5d9 100644 --- a/internal/guardian/guardian.go +++ b/internal/safety/guardian/guardian.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/nilutil" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // PolicyPrompt returns the guardian safety policy as a string. The policy is diff --git a/internal/guardian/guardian_policy.md b/internal/safety/guardian/guardian_policy.md similarity index 100% rename from internal/guardian/guardian_policy.md rename to internal/safety/guardian/guardian_policy.md diff --git a/internal/guardian/guardian_test.go b/internal/safety/guardian/guardian_test.go similarity index 99% rename from internal/guardian/guardian_test.go rename to internal/safety/guardian/guardian_test.go index 2db212a08b..b1fa64e4e9 100644 --- a/internal/guardian/guardian_test.go +++ b/internal/safety/guardian/guardian_test.go @@ -12,11 +12,11 @@ import ( "sync" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) type scriptedProvider struct { diff --git a/internal/guardian/policy.go b/internal/safety/guardian/policy.go similarity index 100% rename from internal/guardian/policy.go rename to internal/safety/guardian/policy.go diff --git a/internal/guardian/transcript.go b/internal/safety/guardian/transcript.go similarity index 99% rename from internal/guardian/transcript.go rename to internal/safety/guardian/transcript.go index c83bdc0ac4..d2a1ab6812 100644 --- a/internal/guardian/transcript.go +++ b/internal/safety/guardian/transcript.go @@ -6,7 +6,7 @@ import ( "strings" "unicode/utf8" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // TranscriptEntry is one simplified conversation entry for guardian review. diff --git a/internal/permission/bash_approval.go b/internal/safety/permission/bash_approval.go similarity index 99% rename from internal/permission/bash_approval.go rename to internal/safety/permission/bash_approval.go index ebcaba644d..b3046f311a 100644 --- a/internal/permission/bash_approval.go +++ b/internal/safety/permission/bash_approval.go @@ -4,8 +4,8 @@ import ( "slices" "strings" - "reasonix/internal/shellparse" - "reasonix/internal/shellsafe" + "reasonix/internal/base/shellparse" + "reasonix/internal/safety/shellsafe" ) type bashApprovalClass uint8 diff --git a/internal/permission/bash_approval_test.go b/internal/safety/permission/bash_approval_test.go similarity index 100% rename from internal/permission/bash_approval_test.go rename to internal/safety/permission/bash_approval_test.go diff --git a/internal/permission/bash_decompose.go b/internal/safety/permission/bash_decompose.go similarity index 97% rename from internal/permission/bash_decompose.go rename to internal/safety/permission/bash_decompose.go index 33fa58c61c..f34e3a1791 100644 --- a/internal/permission/bash_decompose.go +++ b/internal/safety/permission/bash_decompose.go @@ -1,6 +1,6 @@ package permission -import "reasonix/internal/shellparse" +import "reasonix/internal/base/shellparse" // DecomposeBashCommand splits a compound bash command line into its // simple-command segments so each segment can be matched against the rule diff --git a/internal/permission/bash_decompose_test.go b/internal/safety/permission/bash_decompose_test.go similarity index 100% rename from internal/permission/bash_decompose_test.go rename to internal/safety/permission/bash_decompose_test.go diff --git a/internal/permission/bash_destructive_git_test.go b/internal/safety/permission/bash_destructive_git_test.go similarity index 100% rename from internal/permission/bash_destructive_git_test.go rename to internal/safety/permission/bash_destructive_git_test.go diff --git a/internal/permission/bash_readonly.go b/internal/safety/permission/bash_readonly.go similarity index 98% rename from internal/permission/bash_readonly.go rename to internal/safety/permission/bash_readonly.go index 4f3b5ba415..056fe7a2c1 100644 --- a/internal/permission/bash_readonly.go +++ b/internal/safety/permission/bash_readonly.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strings" - "reasonix/internal/shellsafe" + "reasonix/internal/safety/shellsafe" ) // BashCommandIsReadOnly reports whether a bash tool call is a known foreground diff --git a/internal/permission/bash_readonly_test.go b/internal/safety/permission/bash_readonly_test.go similarity index 100% rename from internal/permission/bash_readonly_test.go rename to internal/safety/permission/bash_readonly_test.go diff --git a/internal/permission/bash_redirect.go b/internal/safety/permission/bash_redirect.go similarity index 78% rename from internal/permission/bash_redirect.go rename to internal/safety/permission/bash_redirect.go index 0b9341b81f..e5686de6fb 100644 --- a/internal/permission/bash_redirect.go +++ b/internal/safety/permission/bash_redirect.go @@ -1,6 +1,6 @@ package permission -import "reasonix/internal/shellsafe" +import "reasonix/internal/safety/shellsafe" func normalizeBashSafeRedirectsForMatch(subject string) (string, bool) { return shellsafe.NormalizeBashSafeRedirectsForMatch(subject) diff --git a/internal/permission/bash_redirect_test.go b/internal/safety/permission/bash_redirect_test.go similarity index 100% rename from internal/permission/bash_redirect_test.go rename to internal/safety/permission/bash_redirect_test.go diff --git a/internal/permission/browser_credential.go b/internal/safety/permission/browser_credential.go similarity index 100% rename from internal/permission/browser_credential.go rename to internal/safety/permission/browser_credential.go diff --git a/internal/permission/browser_grant_test.go b/internal/safety/permission/browser_grant_test.go similarity index 100% rename from internal/permission/browser_grant_test.go rename to internal/safety/permission/browser_grant_test.go diff --git a/internal/permission/computer.go b/internal/safety/permission/computer.go similarity index 100% rename from internal/permission/computer.go rename to internal/safety/permission/computer.go diff --git a/internal/permission/computer_test.go b/internal/safety/permission/computer_test.go similarity index 100% rename from internal/permission/computer_test.go rename to internal/safety/permission/computer_test.go diff --git a/internal/permission/install_source.go b/internal/safety/permission/install_source.go similarity index 100% rename from internal/permission/install_source.go rename to internal/safety/permission/install_source.go diff --git a/internal/permission/install_source_test.go b/internal/safety/permission/install_source_test.go similarity index 100% rename from internal/permission/install_source_test.go rename to internal/safety/permission/install_source_test.go diff --git a/internal/permission/permission.go b/internal/safety/permission/permission.go similarity index 99% rename from internal/permission/permission.go rename to internal/safety/permission/permission.go index a13f926877..6b4d1113c0 100644 --- a/internal/permission/permission.go +++ b/internal/safety/permission/permission.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // Decision is the outcome of evaluating a tool call against a Policy. diff --git a/internal/permission/permission_extra_test.go b/internal/safety/permission/permission_extra_test.go similarity index 98% rename from internal/permission/permission_extra_test.go rename to internal/safety/permission/permission_extra_test.go index 3fc11653b5..793dd87278 100644 --- a/internal/permission/permission_extra_test.go +++ b/internal/safety/permission/permission_extra_test.go @@ -163,7 +163,7 @@ func TestRememberRuleWithBashSubjectUsesPrefixWhenAvailable(t *testing.T) { if !RuleMatchesString(got, "bash", "go test ./...") { t.Errorf("prefix rule should match the exact command") } - if !RuleMatchesString(got, "bash", "go test ./internal/control") { + if !RuleMatchesString(got, "bash", "go test ./internal/session/control") { t.Errorf("prefix rule should match similar go test command") } if RuleMatchesString(got, "bash", "go build ./...") { @@ -176,7 +176,7 @@ func TestRememberRuleForBashUsesPrefixWhenAvailable(t *testing.T) { if got != "Bash(go test:*)" { t.Errorf("RememberRuleForScope prefix = %q", got) } - if !RuleMatchesString(got, "bash", "go test ./internal/control") { + if !RuleMatchesString(got, "bash", "go test ./internal/session/control") { t.Errorf("prefix rule should match similar go test command") } if !RuleMatchesString(got, "bash", "go test") { diff --git a/internal/permission/permission_test.go b/internal/safety/permission/permission_test.go similarity index 100% rename from internal/permission/permission_test.go rename to internal/safety/permission/permission_test.go diff --git a/internal/permission/rule_group.go b/internal/safety/permission/rule_group.go similarity index 100% rename from internal/permission/rule_group.go rename to internal/safety/permission/rule_group.go diff --git a/internal/permission/subject.go b/internal/safety/permission/subject.go similarity index 100% rename from internal/permission/subject.go rename to internal/safety/permission/subject.go diff --git a/internal/permission/write_fence.go b/internal/safety/permission/write_fence.go similarity index 100% rename from internal/permission/write_fence.go rename to internal/safety/permission/write_fence.go diff --git a/internal/permission/write_fence_test.go b/internal/safety/permission/write_fence_test.go similarity index 100% rename from internal/permission/write_fence_test.go rename to internal/safety/permission/write_fence_test.go diff --git a/internal/redirectguard/redirectguard.go b/internal/safety/redirectguard/redirectguard.go similarity index 100% rename from internal/redirectguard/redirectguard.go rename to internal/safety/redirectguard/redirectguard.go diff --git a/internal/redirectguard/redirectguard_test.go b/internal/safety/redirectguard/redirectguard_test.go similarity index 100% rename from internal/redirectguard/redirectguard_test.go rename to internal/safety/redirectguard/redirectguard_test.go diff --git a/internal/sandbox/authority.go b/internal/safety/sandbox/authority.go similarity index 100% rename from internal/sandbox/authority.go rename to internal/safety/sandbox/authority.go diff --git a/internal/sandbox/authority_endpoint.go b/internal/safety/sandbox/authority_endpoint.go similarity index 100% rename from internal/sandbox/authority_endpoint.go rename to internal/safety/sandbox/authority_endpoint.go diff --git a/internal/sandbox/authority_test.go b/internal/safety/sandbox/authority_test.go similarity index 100% rename from internal/sandbox/authority_test.go rename to internal/safety/sandbox/authority_test.go diff --git a/internal/sandbox/escape.go b/internal/safety/sandbox/escape.go similarity index 98% rename from internal/sandbox/escape.go rename to internal/safety/sandbox/escape.go index 321b0fd9bf..7bdec2964d 100644 --- a/internal/sandbox/escape.go +++ b/internal/safety/sandbox/escape.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "reasonix/internal/nilutil" + "reasonix/internal/base/nilutil" ) // EscapeRequest describes a one-shot request to rerun a shell command without diff --git a/internal/sandbox/host_authority_test.go b/internal/safety/sandbox/host_authority_test.go similarity index 100% rename from internal/sandbox/host_authority_test.go rename to internal/safety/sandbox/host_authority_test.go diff --git a/internal/sandbox/prepare.go b/internal/safety/sandbox/prepare.go similarity index 100% rename from internal/sandbox/prepare.go rename to internal/safety/sandbox/prepare.go diff --git a/internal/sandbox/prepare_linux.go b/internal/safety/sandbox/prepare_linux.go similarity index 100% rename from internal/sandbox/prepare_linux.go rename to internal/safety/sandbox/prepare_linux.go diff --git a/internal/sandbox/prepare_other.go b/internal/safety/sandbox/prepare_other.go similarity index 100% rename from internal/sandbox/prepare_other.go rename to internal/safety/sandbox/prepare_other.go diff --git a/internal/sandbox/prepare_test.go b/internal/safety/sandbox/prepare_test.go similarity index 100% rename from internal/sandbox/prepare_test.go rename to internal/safety/sandbox/prepare_test.go diff --git a/internal/sandbox/sandbox.go b/internal/safety/sandbox/sandbox.go similarity index 100% rename from internal/sandbox/sandbox.go rename to internal/safety/sandbox/sandbox.go diff --git a/internal/sandbox/sandbox_test.go b/internal/safety/sandbox/sandbox_test.go similarity index 99% rename from internal/sandbox/sandbox_test.go rename to internal/safety/sandbox/sandbox_test.go index f74217cfa4..9fed8fba92 100644 --- a/internal/sandbox/sandbox_test.go +++ b/internal/safety/sandbox/sandbox_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // Spec.Enforce diff --git a/internal/sandbox/seatbelt_darwin.go b/internal/safety/sandbox/seatbelt_darwin.go similarity index 100% rename from internal/sandbox/seatbelt_darwin.go rename to internal/safety/sandbox/seatbelt_darwin.go diff --git a/internal/sandbox/seatbelt_darwin_test.go b/internal/safety/sandbox/seatbelt_darwin_test.go similarity index 99% rename from internal/sandbox/seatbelt_darwin_test.go rename to internal/safety/sandbox/seatbelt_darwin_test.go index 5b102e2994..1400d74834 100644 --- a/internal/sandbox/seatbelt_darwin_test.go +++ b/internal/safety/sandbox/seatbelt_darwin_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // sbplString diff --git a/internal/sandbox/seatbelt_other.go b/internal/safety/sandbox/seatbelt_other.go similarity index 99% rename from internal/sandbox/seatbelt_other.go rename to internal/safety/sandbox/seatbelt_other.go index a206d79586..8c1b3344be 100644 --- a/internal/sandbox/seatbelt_other.go +++ b/internal/safety/sandbox/seatbelt_other.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) var bwrapUsability sync.Map // resolved executable path -> bool diff --git a/internal/sandbox/seatbelt_other_test.go b/internal/safety/sandbox/seatbelt_other_test.go similarity index 99% rename from internal/sandbox/seatbelt_other_test.go rename to internal/safety/sandbox/seatbelt_other_test.go index 00863466c0..4d84770e26 100644 --- a/internal/sandbox/seatbelt_other_test.go +++ b/internal/safety/sandbox/seatbelt_other_test.go @@ -9,7 +9,7 @@ import ( "slices" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestLinuxWriteDirsSkipsMissingDirs(t *testing.T) { diff --git a/internal/sandbox/seatbelt_windows.go b/internal/safety/sandbox/seatbelt_windows.go similarity index 100% rename from internal/sandbox/seatbelt_windows.go rename to internal/safety/sandbox/seatbelt_windows.go diff --git a/internal/sandbox/seatbelt_windows_test.go b/internal/safety/sandbox/seatbelt_windows_test.go similarity index 100% rename from internal/sandbox/seatbelt_windows_test.go rename to internal/safety/sandbox/seatbelt_windows_test.go diff --git a/internal/sandbox/session_temp_env.go b/internal/safety/sandbox/session_temp_env.go similarity index 100% rename from internal/sandbox/session_temp_env.go rename to internal/safety/sandbox/session_temp_env.go diff --git a/internal/sandbox/session_temp_env_test.go b/internal/safety/sandbox/session_temp_env_test.go similarity index 100% rename from internal/sandbox/session_temp_env_test.go rename to internal/safety/sandbox/session_temp_env_test.go diff --git a/internal/sandbox/shell.go b/internal/safety/sandbox/shell.go similarity index 99% rename from internal/sandbox/shell.go rename to internal/safety/sandbox/shell.go index eabc7d8335..11a8b4ebc5 100644 --- a/internal/sandbox/shell.go +++ b/internal/safety/sandbox/shell.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "reasonix/internal/proc" - "reasonix/internal/secrets" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" ) // psUTF8Prologue forces PowerShell to emit UTF-8 instead of the host's OEM code diff --git a/internal/sandbox/shell_detect_test.go b/internal/safety/sandbox/shell_detect_test.go similarity index 100% rename from internal/sandbox/shell_detect_test.go rename to internal/safety/sandbox/shell_detect_test.go diff --git a/internal/sandbox/shell_nul_test.go b/internal/safety/sandbox/shell_nul_test.go similarity index 100% rename from internal/sandbox/shell_nul_test.go rename to internal/safety/sandbox/shell_nul_test.go diff --git a/internal/shellsafe/bash_redirect.go b/internal/safety/shellsafe/bash_redirect.go similarity index 99% rename from internal/shellsafe/bash_redirect.go rename to internal/safety/shellsafe/bash_redirect.go index 7bffd5e21d..d15cc36866 100644 --- a/internal/shellsafe/bash_redirect.go +++ b/internal/safety/shellsafe/bash_redirect.go @@ -6,7 +6,7 @@ import ( "mvdan.cc/sh/v3/syntax" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // NormalizeBashSafeRedirectsForMatch returns a copy of subject with redirect diff --git a/internal/shellsafe/bash_redirect_test.go b/internal/safety/shellsafe/bash_redirect_test.go similarity index 100% rename from internal/shellsafe/bash_redirect_test.go rename to internal/safety/shellsafe/bash_redirect_test.go diff --git a/internal/shellsafe/inline_code.go b/internal/safety/shellsafe/inline_code.go similarity index 100% rename from internal/shellsafe/inline_code.go rename to internal/safety/shellsafe/inline_code.go diff --git a/internal/shellsafe/inline_code_test.go b/internal/safety/shellsafe/inline_code_test.go similarity index 100% rename from internal/shellsafe/inline_code_test.go rename to internal/safety/shellsafe/inline_code_test.go diff --git a/internal/shellsafe/readonly_args.go b/internal/safety/shellsafe/readonly_args.go similarity index 100% rename from internal/shellsafe/readonly_args.go rename to internal/safety/shellsafe/readonly_args.go diff --git a/internal/shellsafe/readonly_args_test.go b/internal/safety/shellsafe/readonly_args_test.go similarity index 100% rename from internal/shellsafe/readonly_args_test.go rename to internal/safety/shellsafe/readonly_args_test.go diff --git a/internal/shellsafe/shellsafe.go b/internal/safety/shellsafe/shellsafe.go similarity index 99% rename from internal/shellsafe/shellsafe.go rename to internal/safety/shellsafe/shellsafe.go index 3fd0ac29b0..b01e3e9e35 100644 --- a/internal/shellsafe/shellsafe.go +++ b/internal/safety/shellsafe/shellsafe.go @@ -9,7 +9,7 @@ import ( "mvdan.cc/sh/v3/syntax" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // ReadOnlyCommands holds single-word commands whose base name alone implies a diff --git a/internal/shellsafe/shellsafe_test.go b/internal/safety/shellsafe/shellsafe_test.go similarity index 100% rename from internal/shellsafe/shellsafe_test.go rename to internal/safety/shellsafe/shellsafe_test.go diff --git a/internal/typesafe/client.go b/internal/safety/typesafe/client.go similarity index 100% rename from internal/typesafe/client.go rename to internal/safety/typesafe/client.go diff --git a/internal/typesafe/client_test.go b/internal/safety/typesafe/client_test.go similarity index 100% rename from internal/typesafe/client_test.go rename to internal/safety/typesafe/client_test.go diff --git a/internal/control/adjudication.go b/internal/session/control/adjudication.go similarity index 99% rename from internal/control/adjudication.go rename to internal/session/control/adjudication.go index 3716fea86b..a2ee5a4d00 100644 --- a/internal/control/adjudication.go +++ b/internal/session/control/adjudication.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/store" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) // A barrier is a historical fact: this turn stopped and waited on a person. diff --git a/internal/control/adjudication_test.go b/internal/session/control/adjudication_test.go similarity index 98% rename from internal/control/adjudication_test.go rename to internal/session/control/adjudication_test.go index f524e898d4..bea9ee5b73 100644 --- a/internal/control/adjudication_test.go +++ b/internal/session/control/adjudication_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/state/store" ) func barrierController(t *testing.T) *Controller { diff --git a/internal/control/admission_generation_test.go b/internal/session/control/admission_generation_test.go similarity index 97% rename from internal/control/admission_generation_test.go rename to internal/session/control/admission_generation_test.go index 079d351b05..6a6a9673e8 100644 --- a/internal/control/admission_generation_test.go +++ b/internal/session/control/admission_generation_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/extension" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension" ) func TestAdmitGuardedTurnRejectsDrainingGeneration(t *testing.T) { diff --git a/internal/control/admission_guard.go b/internal/session/control/admission_guard.go similarity index 97% rename from internal/control/admission_guard.go rename to internal/session/control/admission_guard.go index ba17aea052..ac13b05170 100644 --- a/internal/control/admission_guard.go +++ b/internal/session/control/admission_guard.go @@ -3,8 +3,8 @@ package control import ( "context" - "reasonix/internal/event" - "reasonix/internal/extension" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension" ) // admissionResult classifies what runGuarded did with a turn body. diff --git a/internal/control/admission_test.go b/internal/session/control/admission_test.go similarity index 99% rename from internal/control/admission_test.go rename to internal/session/control/admission_test.go index 5bd03407a0..3817a9244a 100644 --- a/internal/control/admission_test.go +++ b/internal/session/control/admission_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // holdFinishingWindow returns a sink that blocks inside the FIRST TurnDone diff --git a/internal/control/adopt_notice_test.go b/internal/session/control/adopt_notice_test.go similarity index 93% rename from internal/control/adopt_notice_test.go rename to internal/session/control/adopt_notice_test.go index 051a8af5d4..55278e7b58 100644 --- a/internal/control/adopt_notice_test.go +++ b/internal/session/control/adopt_notice_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func coldNoticeController(t *testing.T, sink event.Sink) (*Controller, string) { diff --git a/internal/control/approval.go b/internal/session/control/approval.go similarity index 99% rename from internal/control/approval.go rename to internal/session/control/approval.go index 9c8da9ffdf..6b5b32edc5 100644 --- a/internal/control/approval.go +++ b/internal/session/control/approval.go @@ -12,9 +12,9 @@ import ( "sync" "time" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/permission" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/event" + "reasonix/internal/safety/permission" ) // approvalManager owns the approval/ask prompt bookkeeping and the runtime diff --git a/internal/control/approval_bridge.go b/internal/session/control/approval_bridge.go similarity index 98% rename from internal/control/approval_bridge.go rename to internal/session/control/approval_bridge.go index 6b1c1c5ee9..a8ea0fcc9d 100644 --- a/internal/control/approval_bridge.go +++ b/internal/session/control/approval_bridge.go @@ -11,11 +11,11 @@ import ( "runtime" "strings" - "reasonix/internal/i18n" - "reasonix/internal/memory" - "reasonix/internal/permission" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/permission" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/memory" ) // denyPermissionApprover answers for a session nobody is watching: a headless diff --git a/internal/control/approval_browser_test.go b/internal/session/control/approval_browser_test.go similarity index 98% rename from internal/control/approval_browser_test.go rename to internal/session/control/approval_browser_test.go index 8325c43164..bf632e5d8e 100644 --- a/internal/control/approval_browser_test.go +++ b/internal/session/control/approval_browser_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/permission" + "reasonix/internal/contract/event" + "reasonix/internal/safety/permission" ) // Approving a site for the session answers for loading, reading and operating diff --git a/internal/control/approval_computer_test.go b/internal/session/control/approval_computer_test.go similarity index 99% rename from internal/control/approval_computer_test.go rename to internal/session/control/approval_computer_test.go index 249530008a..efac3aebbf 100644 --- a/internal/control/approval_computer_test.go +++ b/internal/session/control/approval_computer_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // Reading or operating another application is answered by a person in auto, diff --git a/internal/control/approval_e2e_test.go b/internal/session/control/approval_e2e_test.go similarity index 98% rename from internal/control/approval_e2e_test.go rename to internal/session/control/approval_e2e_test.go index 3130d422d3..6ad341d156 100644 --- a/internal/control/approval_e2e_test.go +++ b/internal/session/control/approval_e2e_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" ) func TestPlanApprovedMessageStatesAutoSemantics(t *testing.T) { diff --git a/internal/control/approval_mode_test.go b/internal/session/control/approval_mode_test.go similarity index 100% rename from internal/control/approval_mode_test.go rename to internal/session/control/approval_mode_test.go diff --git a/internal/control/approval_orchestration.go b/internal/session/control/approval_orchestration.go similarity index 98% rename from internal/control/approval_orchestration.go rename to internal/session/control/approval_orchestration.go index 0e2ed7b2af..6b75420264 100644 --- a/internal/control/approval_orchestration.go +++ b/internal/session/control/approval_orchestration.go @@ -6,13 +6,13 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/safety/sandbox" ) // PendingPrompt reports whether the current turn is blocked waiting for a user diff --git a/internal/control/ask_e2e_test.go b/internal/session/control/ask_e2e_test.go similarity index 96% rename from internal/control/ask_e2e_test.go rename to internal/session/control/ask_e2e_test.go index 0597efe955..e8a21080c6 100644 --- a/internal/control/ask_e2e_test.go +++ b/internal/session/control/ask_e2e_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" ) // askQuestionArgs is the model calling `ask` with one two-option question. diff --git a/internal/control/ask_queue_test.go b/internal/session/control/ask_queue_test.go similarity index 98% rename from internal/control/ask_queue_test.go rename to internal/session/control/ask_queue_test.go index f5b9c38507..bf33136de4 100644 --- a/internal/control/ask_queue_test.go +++ b/internal/session/control/ask_queue_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" ) func askProbeQuestions() []event.AskQuestion { diff --git a/internal/control/attachment_root_test.go b/internal/session/control/attachment_root_test.go similarity index 99% rename from internal/control/attachment_root_test.go rename to internal/session/control/attachment_root_test.go index 3f0be8bc0e..9fdffe9613 100644 --- a/internal/control/attachment_root_test.go +++ b/internal/session/control/attachment_root_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // writeAttachment stages a decodable PNG: an attachment whose dimensions cannot diff --git a/internal/control/attachments.go b/internal/session/control/attachments.go similarity index 99% rename from internal/control/attachments.go rename to internal/session/control/attachments.go index a60d9830af..c87999907e 100644 --- a/internal/control/attachments.go +++ b/internal/session/control/attachments.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "reasonix/internal/visionimage" + "reasonix/internal/model/visionimage" ) const maxImageAttachmentBytes = 10 * 1024 * 1024 diff --git a/internal/control/attachments_test.go b/internal/session/control/attachments_test.go similarity index 98% rename from internal/control/attachments_test.go rename to internal/session/control/attachments_test.go index bfddf122de..a5dd9a315b 100644 --- a/internal/control/attachments_test.go +++ b/internal/session/control/attachments_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) const tinyPNG = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==" diff --git a/internal/control/audit_test.go b/internal/session/control/audit_test.go similarity index 98% rename from internal/control/audit_test.go rename to internal/session/control/audit_test.go index 1ae6cd9e5f..81ee778bb0 100644 --- a/internal/control/audit_test.go +++ b/internal/session/control/audit_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "reasonix/internal/event" - "reasonix/internal/planmode" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" ) // ATTACK: the compatibility endpoint approves by id, so it must not be able to diff --git a/internal/control/auto_plan_e2e_test.go b/internal/session/control/auto_plan_e2e_test.go similarity index 97% rename from internal/control/auto_plan_e2e_test.go rename to internal/session/control/auto_plan_e2e_test.go index df704d8b0d..54fcee2df4 100644 --- a/internal/control/auto_plan_e2e_test.go +++ b/internal/session/control/auto_plan_e2e_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // scriptedTurns is a provider that replays a distinct chunk set per Stream call, diff --git a/internal/control/bash_dynamic_approval_test.go b/internal/session/control/bash_dynamic_approval_test.go similarity index 98% rename from internal/control/bash_dynamic_approval_test.go rename to internal/session/control/bash_dynamic_approval_test.go index 19238e7d7e..5a5fcb47ca 100644 --- a/internal/control/bash_dynamic_approval_test.go +++ b/internal/session/control/bash_dynamic_approval_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/guardian" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/guardian" + "reasonix/internal/safety/permission" ) const dynamicBashCommand = "git status $(touch /tmp/reasonix-dynamic-approval)" diff --git a/internal/control/boundary.go b/internal/session/control/boundary.go similarity index 99% rename from internal/control/boundary.go rename to internal/session/control/boundary.go index 404ddc128f..b6ca4d0c09 100644 --- a/internal/control/boundary.go +++ b/internal/session/control/boundary.go @@ -9,8 +9,8 @@ import ( "runtime" "strings" - "reasonix/internal/config" - "reasonix/internal/sandbox" + "reasonix/internal/contract/config" + "reasonix/internal/safety/sandbox" ) // PermissionLists is one layer of the fine-grained gate: three ordered lists diff --git a/internal/control/branches.go b/internal/session/control/branches.go similarity index 99% rename from internal/control/branches.go rename to internal/session/control/branches.go index 7dee962248..99614bc68d 100644 --- a/internal/control/branches.go +++ b/internal/session/control/branches.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) func (c *Controller) BranchTreeText() string { diff --git a/internal/control/branches_test.go b/internal/session/control/branches_test.go similarity index 98% rename from internal/control/branches_test.go rename to internal/session/control/branches_test.go index 8a5c80d331..20a07ed9ae 100644 --- a/internal/control/branches_test.go +++ b/internal/session/control/branches_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) func TestBranchAndSwitch(t *testing.T) { diff --git a/internal/control/browser_open_test.go b/internal/session/control/browser_open_test.go similarity index 98% rename from internal/control/browser_open_test.go rename to internal/session/control/browser_open_test.go index 6cd8ee0d9a..2719f1c30f 100644 --- a/internal/control/browser_open_test.go +++ b/internal/session/control/browser_open_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "reasonix/internal/browser" + "reasonix/internal/platform/browser" ) type fakeTabs struct { diff --git a/internal/control/capability.go b/internal/session/control/capability.go similarity index 97% rename from internal/control/capability.go rename to internal/session/control/capability.go index 7eff1b406b..911202a4b2 100644 --- a/internal/control/capability.go +++ b/internal/session/control/capability.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "reasonix/internal/agent" - "reasonix/internal/capability" - "reasonix/internal/config" - "reasonix/internal/plugin" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/capability" ) func (c *Controller) withCapabilityRoute(ctx context.Context, composed, routeInput string) string { diff --git a/internal/control/capability_scope.go b/internal/session/control/capability_scope.go similarity index 97% rename from internal/control/capability_scope.go rename to internal/session/control/capability_scope.go index d57413191b..54ad7a8328 100644 --- a/internal/control/capability_scope.go +++ b/internal/session/control/capability_scope.go @@ -5,10 +5,10 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" - "reasonix/internal/fileutil" - "reasonix/internal/skill" - "reasonix/internal/workspaceid" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/workspaceid" + "reasonix/internal/contract/config" + "reasonix/internal/ext/skill" ) // CapabilityScope names the project a capability listing belongs to. A shell diff --git a/internal/control/capability_scope_test.go b/internal/session/control/capability_scope_test.go similarity index 98% rename from internal/control/capability_scope_test.go rename to internal/session/control/capability_scope_test.go index 63f0efe221..fbe267b14d 100644 --- a/internal/control/capability_scope_test.go +++ b/internal/session/control/capability_scope_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) // Two folders named alike are the common case in a picker, and the whole path diff --git a/internal/control/capability_test.go b/internal/session/control/capability_test.go similarity index 97% rename from internal/control/capability_test.go rename to internal/session/control/capability_test.go index 494be7be5f..fdba9c11d0 100644 --- a/internal/control/capability_test.go +++ b/internal/session/control/capability_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "reasonix/internal/capability" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/capability" ) type capabilityRecordingRunner struct { diff --git a/internal/control/chat_run_budget_test.go b/internal/session/control/chat_run_budget_test.go similarity index 95% rename from internal/control/chat_run_budget_test.go rename to internal/session/control/chat_run_budget_test.go index 91e920ffdb..fcfa4815fa 100644 --- a/internal/control/chat_run_budget_test.go +++ b/internal/session/control/chat_run_budget_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // wanderingChatProvider never repeats itself: every round reads one more path, diff --git a/internal/control/checkpoint.go b/internal/session/control/checkpoint.go similarity index 98% rename from internal/control/checkpoint.go rename to internal/session/control/checkpoint.go index 5000632c52..509c04433c 100644 --- a/internal/control/checkpoint.go +++ b/internal/session/control/checkpoint.go @@ -10,12 +10,12 @@ import ( "sync/atomic" "time" - "reasonix/internal/agent" - "reasonix/internal/checkpoint" - "reasonix/internal/diff" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/store" + "reasonix/internal/base/diff" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/checkpoint" + "reasonix/internal/state/store" ) // checkpointManager owns the snapshot-based rewind bookkeeping: the per-session diff --git a/internal/control/checkpoint_prompt_test.go b/internal/session/control/checkpoint_prompt_test.go similarity index 95% rename from internal/control/checkpoint_prompt_test.go rename to internal/session/control/checkpoint_prompt_test.go index 71131db28e..bd31e288f0 100644 --- a/internal/control/checkpoint_prompt_test.go +++ b/internal/session/control/checkpoint_prompt_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" ) // A checkpoint opens with the composed turn, so its stored prompt carries the diff --git a/internal/control/close_idempotent_test.go b/internal/session/control/close_idempotent_test.go similarity index 94% rename from internal/control/close_idempotent_test.go rename to internal/session/control/close_idempotent_test.go index cb1b48ef8c..9d4eaf7421 100644 --- a/internal/control/close_idempotent_test.go +++ b/internal/session/control/close_idempotent_test.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "testing" - "reasonix/internal/hook" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/ext/hook" ) // TestCloseIsIdempotent guards the desktop tab-lifecycle contract: rebind, diff --git a/internal/control/compaction_settings.go b/internal/session/control/compaction_settings.go similarity index 98% rename from internal/control/compaction_settings.go rename to internal/session/control/compaction_settings.go index 3430e530c6..5e0819369b 100644 --- a/internal/control/compaction_settings.go +++ b/internal/session/control/compaction_settings.go @@ -3,7 +3,7 @@ package control import ( "fmt" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // CompactionSettings is what the two configured bounds are and which of them diff --git a/internal/control/complete.go b/internal/session/control/complete.go similarity index 99% rename from internal/control/complete.go rename to internal/session/control/complete.go index 8e06fd0bfa..0dfc9aeac5 100644 --- a/internal/control/complete.go +++ b/internal/session/control/complete.go @@ -7,9 +7,9 @@ import ( "sort" "strings" - "reasonix/internal/fileref" - "reasonix/internal/gitignore" - "reasonix/internal/plugin" + "reasonix/internal/base/fileref" + "reasonix/internal/base/gitignore" + "reasonix/internal/ext/plugin" ) // The three menus a composer can be showing. A frontend renders them diff --git a/internal/control/complete_test.go b/internal/session/control/complete_test.go similarity index 99% rename from internal/control/complete_test.go rename to internal/session/control/complete_test.go index 7ada7a5fc8..ac10e3c23f 100644 --- a/internal/control/complete_test.go +++ b/internal/session/control/complete_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func writeAt(t *testing.T, root, rel string) { diff --git a/internal/control/config_problem.go b/internal/session/control/config_problem.go similarity index 98% rename from internal/control/config_problem.go rename to internal/session/control/config_problem.go index ed1be22ab2..426d76705f 100644 --- a/internal/control/config_problem.go +++ b/internal/session/control/config_problem.go @@ -4,7 +4,7 @@ package control import ( "errors" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // ConfigProblem is what a settings surface shows in place of a save it cannot diff --git a/internal/control/config_write_approval_test.go b/internal/session/control/config_write_approval_test.go similarity index 98% rename from internal/control/config_write_approval_test.go rename to internal/session/control/config_write_approval_test.go index 30f6573ea7..2d1de19500 100644 --- a/internal/control/config_write_approval_test.go +++ b/internal/session/control/config_write_approval_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "reasonix/internal/permission" + "reasonix/internal/safety/permission" ) // TestManagedConfigWriteApprovalIsFreshHuman pins the security contract of the diff --git a/internal/control/context_command.go b/internal/session/control/context_command.go similarity index 99% rename from internal/control/context_command.go rename to internal/session/control/context_command.go index 6c0a11408a..daff4e2a48 100644 --- a/internal/control/context_command.go +++ b/internal/session/control/context_command.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // ContextReport renders the current context state as a one-line summary plus diff --git a/internal/control/context_command_test.go b/internal/session/control/context_command_test.go similarity index 98% rename from internal/control/context_command_test.go rename to internal/session/control/context_command_test.go index c0cd779793..9a5bb895f7 100644 --- a/internal/control/context_command_test.go +++ b/internal/session/control/context_command_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // "70% full" does not tell the user whether that is close to anything, so the diff --git a/internal/control/context_status.go b/internal/session/control/context_status.go similarity index 91% rename from internal/control/context_status.go rename to internal/session/control/context_status.go index 09870d82f5..b3aa26989b 100644 --- a/internal/control/context_status.go +++ b/internal/session/control/context_status.go @@ -1,8 +1,8 @@ package control import ( - "reasonix/internal/agent" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // ContextMaintenanceSnapshot exposes current composition and the last durable diff --git a/internal/control/controller.go b/internal/session/control/controller.go similarity index 97% rename from internal/control/controller.go rename to internal/session/control/controller.go index 2490a1b639..91dc39c63b 100644 --- a/internal/control/controller.go +++ b/internal/session/control/controller.go @@ -23,39 +23,39 @@ import ( "sync/atomic" "time" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/billing" - "reasonix/internal/browser" - "reasonix/internal/capability" - "reasonix/internal/checkpoint" - "reasonix/internal/command" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/uihub" - "reasonix/internal/goaleval" - "reasonix/internal/guardian" - "reasonix/internal/hook" - "reasonix/internal/i18n" - "reasonix/internal/jobs" - "reasonix/internal/memory" - "reasonix/internal/nilutil" - "reasonix/internal/permission" - "reasonix/internal/planmode" - "reasonix/internal/plugin" - "reasonix/internal/promptrefine" - "reasonix/internal/provider" - "reasonix/internal/recovery" - "reasonix/internal/sandbox" - "reasonix/internal/sessiontemp" - "reasonix/internal/shellrun" - "reasonix/internal/skill" - "reasonix/internal/taskmonitor" - "reasonix/internal/tool" - "reasonix/internal/workspacelease" + "reasonix/internal/base/i18n" + "reasonix/internal/base/nilutil" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/command" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/uihub" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/model/billing" + "reasonix/internal/platform/browser" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/goaleval" + "reasonix/internal/runtime/jobs" + "reasonix/internal/runtime/promptrefine" + "reasonix/internal/runtime/recovery" + "reasonix/internal/runtime/taskmonitor" + "reasonix/internal/safety/guardian" + "reasonix/internal/safety/permission" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/checkpoint" + "reasonix/internal/state/memory" + "reasonix/internal/state/sessiontemp" + "reasonix/internal/state/workspacelease" + "reasonix/internal/tools/shellrun" ) // ErrTurnRunning reports that a caller tried to start a second foreground turn diff --git a/internal/control/controller_deps.go b/internal/session/control/controller_deps.go similarity index 92% rename from internal/control/controller_deps.go rename to internal/session/control/controller_deps.go index 63c38f91b1..9ba4505788 100644 --- a/internal/control/controller_deps.go +++ b/internal/session/control/controller_deps.go @@ -3,22 +3,22 @@ package control import ( "context" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/goaleval" - "reasonix/internal/guardian" - "reasonix/internal/hook" - "reasonix/internal/jobs" - "reasonix/internal/permission" - "reasonix/internal/plugin" - "reasonix/internal/promptrefine" - "reasonix/internal/recovery" - "reasonix/internal/sandbox" - "reasonix/internal/skill" - "reasonix/internal/workspacelease" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/model/billing" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/goaleval" + "reasonix/internal/runtime/jobs" + "reasonix/internal/runtime/promptrefine" + "reasonix/internal/runtime/recovery" + "reasonix/internal/safety/guardian" + "reasonix/internal/safety/permission" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/workspacelease" ) // controllerDeps is what assembly hands the controller and never rebinds. The diff --git a/internal/control/controller_lock_test.go b/internal/session/control/controller_lock_test.go similarity index 96% rename from internal/control/controller_lock_test.go rename to internal/session/control/controller_lock_test.go index 8bdff758be..427e95850d 100644 --- a/internal/control/controller_lock_test.go +++ b/internal/session/control/controller_lock_test.go @@ -7,10 +7,10 @@ import ( "sync" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // TestCompactRefusedWhileRunning locks in the same guard Rewind/Branch have: diff --git a/internal/control/controller_test.go b/internal/session/control/controller_test.go similarity index 99% rename from internal/control/controller_test.go rename to internal/session/control/controller_test.go index 7f70908b59..1ee3c062a0 100644 --- a/internal/control/controller_test.go +++ b/internal/session/control/controller_test.go @@ -18,24 +18,24 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/checkpoint" - "reasonix/internal/command" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/guardian" - "reasonix/internal/hook" - "reasonix/internal/i18n" - "reasonix/internal/jobs" - "reasonix/internal/memory" - "reasonix/internal/permission" - "reasonix/internal/plugin" - "reasonix/internal/pluginpkg" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/store" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/i18n" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/command" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" + "reasonix/internal/safety/guardian" + "reasonix/internal/safety/permission" + "reasonix/internal/state/checkpoint" + "reasonix/internal/state/memory" + "reasonix/internal/state/store" ) type typedNilControllerSink struct{} @@ -4082,7 +4082,7 @@ func TestApprovalSessionGrantCanScopeBashToCommandPrefix(t *testing.T) { c.Approve(<-ids, true, false, false) }() - for i, subject := range []string{"go test ./...", "go test ./internal/control", "go build ./..."} { + for i, subject := range []string{"go test ./...", "go test ./internal/session/control", "go build ./..."} { allow, _, err := gateApprover{c}.Approve(context.Background(), "bash", subject, nil) if err != nil || !allow { t.Fatalf("call %d = (%v,%v), want allow", i, allow, err) diff --git a/internal/control/decisions.go b/internal/session/control/decisions.go similarity index 99% rename from internal/control/decisions.go rename to internal/session/control/decisions.go index ebe79b7e62..8d0cd8f8f1 100644 --- a/internal/control/decisions.go +++ b/internal/session/control/decisions.go @@ -3,7 +3,7 @@ package control import ( "sort" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // Decisions are projections of host-owned state, not state themselves. Acting diff --git a/internal/control/decisions_test.go b/internal/session/control/decisions_test.go similarity index 99% rename from internal/control/decisions_test.go rename to internal/session/control/decisions_test.go index 2a6d3a7ff8..28b41cd940 100644 --- a/internal/control/decisions_test.go +++ b/internal/session/control/decisions_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/planmode" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" ) func waitForDecisions(t *testing.T, c *Controller, want int) []Decision { diff --git a/internal/control/display_prefs.go b/internal/session/control/display_prefs.go similarity index 94% rename from internal/control/display_prefs.go rename to internal/session/control/display_prefs.go index fa21e7c77d..26ccf6199f 100644 --- a/internal/control/display_prefs.go +++ b/internal/session/control/display_prefs.go @@ -1,6 +1,6 @@ package control -import "reasonix/internal/config" +import "reasonix/internal/contract/config" // displayPrefs is what a session shows, as opposed to what it does. Grouping // them costs one field where loose ones cost one each, and the grouping is not diff --git a/internal/control/docs_command.go b/internal/session/control/docs_command.go similarity index 95% rename from internal/control/docs_command.go rename to internal/session/control/docs_command.go index 8fe28c0f6a..6e0898d5a3 100644 --- a/internal/control/docs_command.go +++ b/internal/session/control/docs_command.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "reasonix/internal/i18n" - "reasonix/internal/productdocs" + "reasonix/internal/base/i18n" + "reasonix/internal/tools/productdocs" ) // DocsCommandOverviewFor keeps local help aligned with the invocation selected diff --git a/internal/control/dropped.go b/internal/session/control/dropped.go similarity index 100% rename from internal/control/dropped.go rename to internal/session/control/dropped.go diff --git a/internal/control/errmsg.go b/internal/session/control/errmsg.go similarity index 97% rename from internal/control/errmsg.go rename to internal/session/control/errmsg.go index ef07574930..0385f223d2 100644 --- a/internal/control/errmsg.go +++ b/internal/session/control/errmsg.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "reasonix/internal/i18n" - "reasonix/internal/neterr" - "reasonix/internal/provider" - "reasonix/internal/secrets" + "reasonix/internal/base/i18n" + "reasonix/internal/base/neterr" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/provider" ) // explainError maps a provider HTTP failure to an actionable, localized message diff --git a/internal/control/errmsg_test.go b/internal/session/control/errmsg_test.go similarity index 99% rename from internal/control/errmsg_test.go rename to internal/session/control/errmsg_test.go index 11aee92747..8cd3efd7b7 100644 --- a/internal/control/errmsg_test.go +++ b/internal/session/control/errmsg_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/i18n" - "reasonix/internal/provider" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/provider" ) func TestExplainError(t *testing.T) { diff --git a/internal/control/execution.go b/internal/session/control/execution.go similarity index 98% rename from internal/control/execution.go rename to internal/session/control/execution.go index a1744893f5..3b673265d4 100644 --- a/internal/control/execution.go +++ b/internal/session/control/execution.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "reasonix/internal/agent" - "reasonix/internal/execjournal" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/execjournal" ) // beginTurn marks the turn and hands back a context carrying its identity, so diff --git a/internal/control/execution_graph.go b/internal/session/control/execution_graph.go similarity index 95% rename from internal/control/execution_graph.go rename to internal/session/control/execution_graph.go index 4272923422..f339588a77 100644 --- a/internal/control/execution_graph.go +++ b/internal/session/control/execution_graph.go @@ -3,10 +3,10 @@ package control import ( "strings" - "reasonix/internal/agent" - "reasonix/internal/agentgraph" - "reasonix/internal/execgraph" - "reasonix/internal/execjournal" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/execgraph" + "reasonix/internal/state/execjournal" ) // ExecutionGraphSnapshot is the run graph as this session's durable facts diff --git a/internal/control/execution_test.go b/internal/session/control/execution_test.go similarity index 97% rename from internal/control/execution_test.go rename to internal/session/control/execution_test.go index 791b9060c7..bd5d0d5c9b 100644 --- a/internal/control/execution_test.go +++ b/internal/session/control/execution_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/execjournal" + "reasonix/internal/state/execjournal" ) // TestInterruptedExecutionBlockNamesEveryEntry: a block that says work was cut diff --git a/internal/control/extension_ui.go b/internal/session/control/extension_ui.go similarity index 98% rename from internal/control/extension_ui.go rename to internal/session/control/extension_ui.go index 4e4c97b9e8..958289bc3e 100644 --- a/internal/control/extension_ui.go +++ b/internal/session/control/extension_ui.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "reasonix/internal/event" - "reasonix/internal/extension/uihub" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension/uihub" ) // Extension UI hub wiring (Extension Protocol v2). The hub is the diff --git a/internal/control/extension_ui_test.go b/internal/session/control/extension_ui_test.go similarity index 97% rename from internal/control/extension_ui_test.go rename to internal/session/control/extension_ui_test.go index 82e4de25ac..c06baee560 100644 --- a/internal/control/extension_ui_test.go +++ b/internal/session/control/extension_ui_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/extension/protocol" - "reasonix/internal/extension/uihub" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/ext/extension/uihub" ) // fakeExtensionClient is the uihub.ActionClient double for the controller diff --git a/internal/control/extensions.go b/internal/session/control/extensions.go similarity index 97% rename from internal/control/extensions.go rename to internal/session/control/extensions.go index 1d2048bc42..cc24c15468 100644 --- a/internal/control/extensions.go +++ b/internal/session/control/extensions.go @@ -6,13 +6,13 @@ import ( "log/slog" "sync" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/evidence" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" ) // Extension dispatch wiring. Nil dispatcher is a no-op. diff --git a/internal/control/extensions_test.go b/internal/session/control/extensions_test.go similarity index 98% rename from internal/control/extensions_test.go rename to internal/session/control/extensions_test.go index 0ac0103e89..0731febe8b 100644 --- a/internal/control/extensions_test.go +++ b/internal/session/control/extensions_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/extension/protocol" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/ext/extension/protocol" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/agent/testutil" ) // Control wiring tests. The dispatcher under test is real; only its diff --git a/internal/control/external_folders.go b/internal/session/control/external_folders.go similarity index 100% rename from internal/control/external_folders.go rename to internal/session/control/external_folders.go diff --git a/internal/control/frontend_sink_capability_test.go b/internal/session/control/frontend_sink_capability_test.go similarity index 94% rename from internal/control/frontend_sink_capability_test.go rename to internal/session/control/frontend_sink_capability_test.go index f642229232..d0718bf662 100644 --- a/internal/control/frontend_sink_capability_test.go +++ b/internal/session/control/frontend_sink_capability_test.go @@ -3,8 +3,8 @@ package control import ( "testing" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) // Enabling extensions must never sever the audit channels: every capability diff --git a/internal/control/generation.go b/internal/session/control/generation.go similarity index 97% rename from internal/control/generation.go rename to internal/session/control/generation.go index f8890b4614..ca8911828e 100644 --- a/internal/control/generation.go +++ b/internal/session/control/generation.go @@ -1,8 +1,8 @@ package control import ( - "reasonix/internal/event" - "reasonix/internal/extension" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension" ) // RuntimePhase is the observable publish/drain phase for this controller. diff --git a/internal/control/goal.go b/internal/session/control/goal.go similarity index 99% rename from internal/control/goal.go rename to internal/session/control/goal.go index 222b729396..266cf46422 100644 --- a/internal/control/goal.go +++ b/internal/session/control/goal.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "reasonix/internal/agent" - "reasonix/internal/evidence" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/goaleval" - "reasonix/internal/store" - "reasonix/internal/tool" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/goaleval" + "reasonix/internal/state/store" ) const ( diff --git a/internal/control/goal_boundary_runtime_test.go b/internal/session/control/goal_boundary_runtime_test.go similarity index 98% rename from internal/control/goal_boundary_runtime_test.go rename to internal/session/control/goal_boundary_runtime_test.go index 57c3fca32e..a2488659f9 100644 --- a/internal/control/goal_boundary_runtime_test.go +++ b/internal/session/control/goal_boundary_runtime_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/evidence" - "reasonix/internal/store" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/store" ) func TestMergeGoalProgressEvidenceIsNovelAndBounded(t *testing.T) { diff --git a/internal/control/goal_command.go b/internal/session/control/goal_command.go similarity index 93% rename from internal/control/goal_command.go rename to internal/session/control/goal_command.go index fa53c42e13..410ddd45f7 100644 --- a/internal/control/goal_command.go +++ b/internal/session/control/goal_command.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" ) func (c *Controller) startGoalCommandTurn(cmd GoalCommand, display string) { diff --git a/internal/control/goal_concurrency_test.go b/internal/session/control/goal_concurrency_test.go similarity index 94% rename from internal/control/goal_concurrency_test.go rename to internal/session/control/goal_concurrency_test.go index cffadfadba..ab3e4db77b 100644 --- a/internal/control/goal_concurrency_test.go +++ b/internal/session/control/goal_concurrency_test.go @@ -7,9 +7,9 @@ import ( "sync" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" ) // TestGoalStateWritesAreConcurrencySafe hammers goal-state persistence from many diff --git a/internal/control/goal_contract_test.go b/internal/session/control/goal_contract_test.go similarity index 100% rename from internal/control/goal_contract_test.go rename to internal/session/control/goal_contract_test.go diff --git a/internal/control/goal_control.go b/internal/session/control/goal_control.go similarity index 98% rename from internal/control/goal_control.go rename to internal/session/control/goal_control.go index aebb677a8f..6b804d0ca9 100644 --- a/internal/control/goal_control.go +++ b/internal/session/control/goal_control.go @@ -3,8 +3,8 @@ package control import ( "fmt" - "reasonix/internal/goaleval" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/runtime/goaleval" ) // The Controller's goal verbs: what a frontend calls to set, pause, resume and diff --git a/internal/control/goal_durable.go b/internal/session/control/goal_durable.go similarity index 98% rename from internal/control/goal_durable.go rename to internal/session/control/goal_durable.go index 6b2586a1c2..341ca8a40b 100644 --- a/internal/control/goal_durable.go +++ b/internal/session/control/goal_durable.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "reasonix/internal/evidence" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" + "reasonix/internal/runtime/evidence" ) // goalMachineSnapshot is an in-memory rollback point for durable Goal updates. diff --git a/internal/control/goal_durable_test.go b/internal/session/control/goal_durable_test.go similarity index 93% rename from internal/control/goal_durable_test.go rename to internal/session/control/goal_durable_test.go index 6b09841265..e09316f68a 100644 --- a/internal/control/goal_durable_test.go +++ b/internal/session/control/goal_durable_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" ) func TestSetGoalDurableRollsBackAllRuntimeStateOnWriteFailure(t *testing.T) { diff --git a/internal/control/goal_input_compat_test.go b/internal/session/control/goal_input_compat_test.go similarity index 100% rename from internal/control/goal_input_compat_test.go rename to internal/session/control/goal_input_compat_test.go diff --git a/internal/control/goal_legacy.go b/internal/session/control/goal_legacy.go similarity index 100% rename from internal/control/goal_legacy.go rename to internal/session/control/goal_legacy.go diff --git a/internal/control/goal_legacy_restore_test.go b/internal/session/control/goal_legacy_restore_test.go similarity index 95% rename from internal/control/goal_legacy_restore_test.go rename to internal/session/control/goal_legacy_restore_test.go index 7b9cdf1022..502fa26a86 100644 --- a/internal/control/goal_legacy_restore_test.go +++ b/internal/session/control/goal_legacy_restore_test.go @@ -4,10 +4,10 @@ import ( "encoding/json" "os" "path/filepath" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestUnknownPersistedBudgetClassFallsBackToGoalClassification(t *testing.T) { diff --git a/internal/control/goal_progress.go b/internal/session/control/goal_progress.go similarity index 100% rename from internal/control/goal_progress.go rename to internal/session/control/goal_progress.go diff --git a/internal/control/goal_resume_project_check_test.go b/internal/session/control/goal_resume_project_check_test.go similarity index 96% rename from internal/control/goal_resume_project_check_test.go rename to internal/session/control/goal_resume_project_check_test.go index 905120cb6e..0fe8d4c250 100644 --- a/internal/control/goal_resume_project_check_test.go +++ b/internal/session/control/goal_resume_project_check_test.go @@ -5,13 +5,13 @@ import ( "slices" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/goaleval" - "reasonix/internal/instruction" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/goaleval" + "reasonix/internal/state/instruction" ) // Can a real lifecycle produce a state where the criterion a task is held to diff --git a/internal/control/goal_run_ceiling_test.go b/internal/session/control/goal_run_ceiling_test.go similarity index 94% rename from internal/control/goal_run_ceiling_test.go rename to internal/session/control/goal_run_ceiling_test.go index 09f9f56ffb..bae61accec 100644 --- a/internal/control/goal_run_ceiling_test.go +++ b/internal/session/control/goal_run_ceiling_test.go @@ -7,10 +7,10 @@ import ( "sync/atomic" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // workingGoalTool is a writer, so every round counts as acting on the diff --git a/internal/control/goal_runtime_test.go b/internal/session/control/goal_runtime_test.go similarity index 98% rename from internal/control/goal_runtime_test.go rename to internal/session/control/goal_runtime_test.go index 4899952903..7df9b04e51 100644 --- a/internal/control/goal_runtime_test.go +++ b/internal/session/control/goal_runtime_test.go @@ -7,14 +7,14 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/goaleval" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/goaleval" + "reasonix/internal/state/store" ) // goalRuntimeController wires a controller whose goal turns carry no diff --git a/internal/control/goal_runtime_view.go b/internal/session/control/goal_runtime_view.go similarity index 100% rename from internal/control/goal_runtime_view.go rename to internal/session/control/goal_runtime_view.go diff --git a/internal/control/goal_snapshot_contract_test.go b/internal/session/control/goal_snapshot_contract_test.go similarity index 100% rename from internal/control/goal_snapshot_contract_test.go rename to internal/session/control/goal_snapshot_contract_test.go diff --git a/internal/control/goal_spend_budget_test.go b/internal/session/control/goal_spend_budget_test.go similarity index 95% rename from internal/control/goal_spend_budget_test.go rename to internal/session/control/goal_spend_budget_test.go index f9023f5da0..ed8455885c 100644 --- a/internal/control/goal_spend_budget_test.go +++ b/internal/session/control/goal_spend_budget_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/goaleval" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/goaleval" ) func billedGoalTurn() []provider.Chunk { diff --git a/internal/control/goal_state_compat.go b/internal/session/control/goal_state_compat.go similarity index 100% rename from internal/control/goal_state_compat.go rename to internal/session/control/goal_state_compat.go diff --git a/internal/control/goal_test.go b/internal/session/control/goal_test.go similarity index 99% rename from internal/control/goal_test.go rename to internal/session/control/goal_test.go index 66fad66072..bb35bceb8a 100644 --- a/internal/control/goal_test.go +++ b/internal/session/control/goal_test.go @@ -11,16 +11,16 @@ import ( "sync/atomic" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/goaleval" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/goaleval" + "reasonix/internal/state/store" - "reasonix/internal/testenv" - _ "reasonix/internal/tool/builtin" + "reasonix/internal/base/testenv" + _ "reasonix/internal/tools/builtin" ) // goalRegistry returns a registry carrying the update_goal builtin so scripted diff --git a/internal/control/goal_verification.go b/internal/session/control/goal_verification.go similarity index 96% rename from internal/control/goal_verification.go rename to internal/session/control/goal_verification.go index 7e4150df85..db13bb0ca6 100644 --- a/internal/control/goal_verification.go +++ b/internal/session/control/goal_verification.go @@ -6,8 +6,8 @@ package control import ( "slices" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) // observeVerificationContractDrift compares the contract a resumed Goal was diff --git a/internal/control/goalusage.go b/internal/session/control/goalusage.go similarity index 97% rename from internal/control/goalusage.go rename to internal/session/control/goalusage.go index 42ce2af18f..47e47f2623 100644 --- a/internal/control/goalusage.go +++ b/internal/session/control/goalusage.go @@ -3,8 +3,8 @@ package control import ( "sync" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) // goalUsageTee wraps the controller's event sink and attributes billable usage diff --git a/internal/control/headless_approval_test.go b/internal/session/control/headless_approval_test.go similarity index 98% rename from internal/control/headless_approval_test.go rename to internal/session/control/headless_approval_test.go index 0299396c0b..38a9939c24 100644 --- a/internal/control/headless_approval_test.go +++ b/internal/session/control/headless_approval_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/memory" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/state/memory" ) // runHeadlessWriteOnce drives one write_file tool call through a headless gate in diff --git a/internal/control/history_log.go b/internal/session/control/history_log.go similarity index 94% rename from internal/control/history_log.go rename to internal/session/control/history_log.go index b24fb0f27e..4e01a3dbab 100644 --- a/internal/control/history_log.go +++ b/internal/session/control/history_log.go @@ -1,6 +1,6 @@ package control -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // History returns the executor's current message log (for repopulating a // resumed frontend's view). diff --git a/internal/control/hooks.go b/internal/session/control/hooks.go similarity index 98% rename from internal/control/hooks.go rename to internal/session/control/hooks.go index 2dca66122e..0ed438e6e5 100644 --- a/internal/control/hooks.go +++ b/internal/session/control/hooks.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "reasonix/internal/hook" + "reasonix/internal/ext/hook" ) // A plugin package owns its hooks; editing them here would be overwritten the diff --git a/internal/control/host_authored_test.go b/internal/session/control/host_authored_test.go similarity index 93% rename from internal/control/host_authored_test.go rename to internal/session/control/host_authored_test.go index df1344f277..20f0214154 100644 --- a/internal/control/host_authored_test.go +++ b/internal/session/control/host_authored_test.go @@ -4,12 +4,12 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/agent/testutil" ) // userRows returns the user-role messages with whether the host declared each diff --git a/internal/control/inbox.go b/internal/session/control/inbox.go similarity index 99% rename from internal/control/inbox.go rename to internal/session/control/inbox.go index efb073b8c7..3f14b18d0f 100644 --- a/internal/control/inbox.go +++ b/internal/session/control/inbox.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "reasonix/internal/event" - "reasonix/internal/sessioninbox" + "reasonix/internal/contract/event" + "reasonix/internal/state/sessioninbox" ) // TurnAdmission is the exported classification of TrySubmitInboxItem / diff --git a/internal/control/inbox_cancel_test.go b/internal/session/control/inbox_cancel_test.go similarity index 94% rename from internal/control/inbox_cancel_test.go rename to internal/session/control/inbox_cancel_test.go index 91f3a57339..de82239c13 100644 --- a/internal/control/inbox_cancel_test.go +++ b/internal/session/control/inbox_cancel_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/sessioninbox" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/sessioninbox" ) func steeringTurn(t *testing.T) (*Controller, *agent.Agent, *agent.Session, *inboxSteerProvider, chan event.Event) { diff --git a/internal/control/inbox_dispatch.go b/internal/session/control/inbox_dispatch.go similarity index 98% rename from internal/control/inbox_dispatch.go rename to internal/session/control/inbox_dispatch.go index e9f33f246e..ae2dfeab35 100644 --- a/internal/control/inbox_dispatch.go +++ b/internal/session/control/inbox_dispatch.go @@ -4,7 +4,7 @@ import ( "log/slog" "time" - "reasonix/internal/sessioninbox" + "reasonix/internal/state/sessioninbox" ) const maxInboxDispatchRetryAttempts = 3 diff --git a/internal/control/inbox_dispatch_test.go b/internal/session/control/inbox_dispatch_test.go similarity index 98% rename from internal/control/inbox_dispatch_test.go rename to internal/session/control/inbox_dispatch_test.go index e60a570225..72a38987be 100644 --- a/internal/control/inbox_dispatch_test.go +++ b/internal/session/control/inbox_dispatch_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/sessioninbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/state/sessioninbox" ) type inboxDispatchRunner struct { diff --git a/internal/control/inbox_orphan_recovery_test.go b/internal/session/control/inbox_orphan_recovery_test.go similarity index 98% rename from internal/control/inbox_orphan_recovery_test.go rename to internal/session/control/inbox_orphan_recovery_test.go index 78ad4697d8..371337c781 100644 --- a/internal/control/inbox_orphan_recovery_test.go +++ b/internal/session/control/inbox_orphan_recovery_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/filelock" - "reasonix/internal/sessioninbox" - "reasonix/internal/testenv" + "reasonix/internal/base/filelock" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/state/sessioninbox" ) func TestInboxSnapshotRecoversUnownedInFlightItem(t *testing.T) { diff --git a/internal/control/inbox_refs.go b/internal/session/control/inbox_refs.go similarity index 97% rename from internal/control/inbox_refs.go rename to internal/session/control/inbox_refs.go index ba2e3e2079..a21a8a48a4 100644 --- a/internal/control/inbox_refs.go +++ b/internal/session/control/inbox_refs.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "reasonix/internal/sessioninbox" + "reasonix/internal/state/sessioninbox" ) func (c *Controller) freezeInboxReferences(ctx context.Context, submit string, explicit []string) (string, []string, []string) { diff --git a/internal/control/inbox_run.go b/internal/session/control/inbox_run.go similarity index 98% rename from internal/control/inbox_run.go rename to internal/session/control/inbox_run.go index d604c40bf7..e303106774 100644 --- a/internal/control/inbox_run.go +++ b/internal/session/control/inbox_run.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "reasonix/internal/sessioninbox" + "reasonix/internal/state/sessioninbox" ) // RunInboxTurn synchronously claims and executes one durable item. ACP uses diff --git a/internal/control/inbox_sink.go b/internal/session/control/inbox_sink.go similarity index 96% rename from internal/control/inbox_sink.go rename to internal/session/control/inbox_sink.go index bc8181f1e0..a119d640e7 100644 --- a/internal/control/inbox_sink.go +++ b/internal/session/control/inbox_sink.go @@ -1,6 +1,6 @@ package control -import "reasonix/internal/event" +import "reasonix/internal/contract/event" // inboxEventSink observes Steer and unapplied-steer events so durable inbox // state tracks consumption without frontends matching on text. diff --git a/internal/control/inbox_steer.go b/internal/session/control/inbox_steer.go similarity index 99% rename from internal/control/inbox_steer.go rename to internal/session/control/inbox_steer.go index 8c9314b814..b3b0fd012c 100644 --- a/internal/control/inbox_steer.go +++ b/internal/session/control/inbox_steer.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/event" - "reasonix/internal/sessioninbox" + "reasonix/internal/contract/event" + "reasonix/internal/state/sessioninbox" ) // ErrSteerApplied is the identity of "too late": the running turn has already diff --git a/internal/control/inbox_test.go b/internal/session/control/inbox_test.go similarity index 98% rename from internal/control/inbox_test.go rename to internal/session/control/inbox_test.go index ba94142559..fdef4f685c 100644 --- a/internal/control/inbox_test.go +++ b/internal/session/control/inbox_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/memory" - "reasonix/internal/provider" - "reasonix/internal/sessioninbox" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/memory" + "reasonix/internal/state/sessioninbox" ) // Frontends rebuild the queue from the kernel on this frame and on nothing diff --git a/internal/control/input.go b/internal/session/control/input.go similarity index 98% rename from internal/control/input.go rename to internal/session/control/input.go index d7ce07a854..f621f51d8b 100644 --- a/internal/control/input.go +++ b/internal/session/control/input.go @@ -6,10 +6,10 @@ import ( "strings" "unicode" - "reasonix/internal/agent" - "reasonix/internal/memory" - "reasonix/internal/planmode" - "reasonix/internal/skill" + "reasonix/internal/contract/planmode" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/memory" ) // InvocationRequest is an explicit user-selected Skill or Subagent entity. @@ -91,7 +91,7 @@ func IsSyntheticUserMessage(content string) bool { if trimmed := strings.TrimSpace(agent.StripTransientUserBlocks(content)); trimmed == planApprovedMessage { return true } - // The prefix list lives in internal/agent (agent.SyntheticUserPrefixes) so + // The prefix list lives in internal/runtime/agent (agent.SyntheticUserPrefixes) so // preview/title/turn-count derivations there share the exact same filter // (#3653). return agent.IsSyntheticUserText(content) diff --git a/internal/control/input_test.go b/internal/session/control/input_test.go similarity index 99% rename from internal/control/input_test.go rename to internal/session/control/input_test.go index f2973c63b4..ab64ebf1e1 100644 --- a/internal/control/input_test.go +++ b/internal/session/control/input_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/planmode" + "reasonix/internal/contract/planmode" + "reasonix/internal/runtime/agent" - "reasonix/internal/command" - "reasonix/internal/event" - "reasonix/internal/hook" - "reasonix/internal/memory" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/command" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/skill" + "reasonix/internal/state/memory" ) type fakeTurnRunner struct { diff --git a/internal/control/inputimages_test.go b/internal/session/control/inputimages_test.go similarity index 98% rename from internal/control/inputimages_test.go rename to internal/session/control/inputimages_test.go index ec5c01252a..0eb1b16e16 100644 --- a/internal/control/inputimages_test.go +++ b/internal/session/control/inputimages_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" ) func writeVisionTestConfig(t *testing.T, root string) { diff --git a/internal/control/jobs_bridge.go b/internal/session/control/jobs_bridge.go similarity index 98% rename from internal/control/jobs_bridge.go rename to internal/session/control/jobs_bridge.go index 1736b38274..d2809f5f89 100644 --- a/internal/control/jobs_bridge.go +++ b/internal/session/control/jobs_bridge.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/jobs" - "reasonix/internal/sessioninbox" - "reasonix/internal/taskmonitor" + "reasonix/internal/runtime/jobs" + "reasonix/internal/runtime/taskmonitor" + "reasonix/internal/state/sessioninbox" ) // hostContinuationSource labels inbox items the runtime authored for itself. diff --git a/internal/control/jobs_bridge_test.go b/internal/session/control/jobs_bridge_test.go similarity index 97% rename from internal/control/jobs_bridge_test.go rename to internal/session/control/jobs_bridge_test.go index d472271eb1..d2c9e9b24d 100644 --- a/internal/control/jobs_bridge_test.go +++ b/internal/session/control/jobs_bridge_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/sessioninbox" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" + "reasonix/internal/state/sessioninbox" ) func backgroundJobEvent(id string) jobs.CompletionEvent { diff --git a/internal/control/main_test.go b/internal/session/control/main_test.go similarity index 92% rename from internal/control/main_test.go rename to internal/session/control/main_test.go index d9bc0091a4..cde48f7525 100644 --- a/internal/control/main_test.go +++ b/internal/session/control/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" "go.uber.org/goleak" ) diff --git a/internal/control/mcp.go b/internal/session/control/mcp.go similarity index 99% rename from internal/control/mcp.go rename to internal/session/control/mcp.go index 33ea068874..502bb715e2 100644 --- a/internal/control/mcp.go +++ b/internal/session/control/mcp.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "reasonix/internal/plugin" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/plugin" ) // mcpManager owns the session's live tool/plugin surface: the MCP plugin Host diff --git a/internal/control/mcp_admin.go b/internal/session/control/mcp_admin.go similarity index 99% rename from internal/control/mcp_admin.go rename to internal/session/control/mcp_admin.go index 04f3b3782e..5085befe7d 100644 --- a/internal/control/mcp_admin.go +++ b/internal/session/control/mcp_admin.go @@ -6,8 +6,8 @@ import ( "log/slog" "strings" - "reasonix/internal/config" - "reasonix/internal/plugin" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" ) // MCPScope is how far an installed server reaches. User follows the person diff --git a/internal/control/mcp_cached_facts_test.go b/internal/session/control/mcp_cached_facts_test.go similarity index 96% rename from internal/control/mcp_cached_facts_test.go rename to internal/session/control/mcp_cached_facts_test.go index 3c4e1c8534..678cfc1de9 100644 --- a/internal/control/mcp_cached_facts_test.go +++ b/internal/session/control/mcp_cached_facts_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - "reasonix/internal/config" - "reasonix/internal/plugin" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" ) func factsSpec() plugin.Spec { diff --git a/internal/control/mcp_catalog_test.go b/internal/session/control/mcp_catalog_test.go similarity index 98% rename from internal/control/mcp_catalog_test.go rename to internal/session/control/mcp_catalog_test.go index b029c7bc23..ca91faa279 100644 --- a/internal/control/mcp_catalog_test.go +++ b/internal/session/control/mcp_catalog_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // catalogTool is a tool that names the server it came from, which is all the diff --git a/internal/control/mcp_remove_oauth.go b/internal/session/control/mcp_remove_oauth.go similarity index 91% rename from internal/control/mcp_remove_oauth.go rename to internal/session/control/mcp_remove_oauth.go index 9307278e06..3ecff284b6 100644 --- a/internal/control/mcp_remove_oauth.go +++ b/internal/session/control/mcp_remove_oauth.go @@ -3,9 +3,9 @@ package control import ( "fmt" - "reasonix/internal/config" - "reasonix/internal/mcpdiag" - "reasonix/internal/plugin" + "reasonix/internal/contract/config" + "reasonix/internal/ext/mcpdiag" + "reasonix/internal/ext/plugin" ) type removedMCPState struct { diff --git a/internal/control/mcp_servers.go b/internal/session/control/mcp_servers.go similarity index 99% rename from internal/control/mcp_servers.go rename to internal/session/control/mcp_servers.go index 57a7471989..e90e7a71ac 100644 --- a/internal/control/mcp_servers.go +++ b/internal/session/control/mcp_servers.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/config" - "reasonix/internal/plugin" + "reasonix/internal/contract/config" + "reasonix/internal/ext/plugin" ) // AddMCPServer connects an MCP server live and persists it to the user-global diff --git a/internal/control/memory.go b/internal/session/control/memory.go similarity index 99% rename from internal/control/memory.go rename to internal/session/control/memory.go index 1601b5f089..fd19475668 100644 --- a/internal/control/memory.go +++ b/internal/session/control/memory.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "reasonix/internal/event" - "reasonix/internal/memory" + "reasonix/internal/contract/event" + "reasonix/internal/state/memory" ) // memoryManager owns the session's loaded memory snapshot, the queue of pending diff --git a/internal/control/memory_command.go b/internal/session/control/memory_command.go similarity index 99% rename from internal/control/memory_command.go rename to internal/session/control/memory_command.go index 1727dd8e6f..6a0b9ed596 100644 --- a/internal/control/memory_command.go +++ b/internal/session/control/memory_command.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/memory" - "reasonix/internal/permission" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/event" + "reasonix/internal/safety/permission" + "reasonix/internal/state/memory" ) const memoryCommandUsage = "usage: /memory [recall|subjects|pin |unpin |verify |revisions |restore |archived|recover |instructions]" diff --git a/internal/control/memory_recall_audit_test.go b/internal/session/control/memory_recall_audit_test.go similarity index 88% rename from internal/control/memory_recall_audit_test.go rename to internal/session/control/memory_recall_audit_test.go index f9d7da6268..7e9609d30c 100644 --- a/internal/control/memory_recall_audit_test.go +++ b/internal/session/control/memory_recall_audit_test.go @@ -3,9 +3,9 @@ package control import ( "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) type recallAuditSink struct { diff --git a/internal/control/memory_test.go b/internal/session/control/memory_test.go similarity index 99% rename from internal/control/memory_test.go rename to internal/session/control/memory_test.go index 7fa1824bcc..51519242aa 100644 --- a/internal/control/memory_test.go +++ b/internal/session/control/memory_test.go @@ -8,8 +8,8 @@ import ( "sync" "testing" - "reasonix/internal/memory" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/memory" ) // TestMemoryWriteReflectsInSnapshot verifies that a memory write lands on disk diff --git a/internal/control/network.go b/internal/session/control/network.go similarity index 98% rename from internal/control/network.go rename to internal/session/control/network.go index 93e61d7e78..56132b2fe0 100644 --- a/internal/control/network.go +++ b/internal/session/control/network.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/netclient" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/config" ) // NetworkSettings is the proxy configuration as an editor needs it: the mode, diff --git a/internal/control/no_runner_test.go b/internal/session/control/no_runner_test.go similarity index 100% rename from internal/control/no_runner_test.go rename to internal/session/control/no_runner_test.go diff --git a/internal/control/plan_seed_test.go b/internal/session/control/plan_seed_test.go similarity index 98% rename from internal/control/plan_seed_test.go rename to internal/session/control/plan_seed_test.go index 97db98489c..fe14b4ae05 100644 --- a/internal/control/plan_seed_test.go +++ b/internal/session/control/plan_seed_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" ) func TestParsePlanTodos(t *testing.T) { diff --git a/internal/control/plan_todos.go b/internal/session/control/plan_todos.go similarity index 98% rename from internal/control/plan_todos.go rename to internal/session/control/plan_todos.go index 8130c9616f..83ed46b7d6 100644 --- a/internal/control/plan_todos.go +++ b/internal/session/control/plan_todos.go @@ -9,9 +9,9 @@ import ( "slices" "strings" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" ) type seedTodo struct { diff --git a/internal/control/planlifecycle.go b/internal/session/control/planlifecycle.go similarity index 98% rename from internal/control/planlifecycle.go rename to internal/session/control/planlifecycle.go index 7615f46f7e..bcf85c760a 100644 --- a/internal/control/planlifecycle.go +++ b/internal/session/control/planlifecycle.go @@ -1,6 +1,6 @@ package control -import "reasonix/internal/planmode" +import "reasonix/internal/contract/planmode" // Where the controller reads and moves the plan lifecycle, and the one place // that projects it back into the legacy on/off flag the wire still carries. diff --git a/internal/control/planner_gate.go b/internal/session/control/planner_gate.go similarity index 97% rename from internal/control/planner_gate.go rename to internal/session/control/planner_gate.go index b12442e114..5fa2298681 100644 --- a/internal/control/planner_gate.go +++ b/internal/session/control/planner_gate.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "reasonix/internal/agent" - "reasonix/internal/agentpreset" - "reasonix/internal/taskpolicy" + "reasonix/internal/contract/agentpreset" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/taskpolicy" ) // The planner gate answers one question: did the user ask for a plan? Twelve diff --git a/internal/control/planner_gate_test.go b/internal/session/control/planner_gate_test.go similarity index 99% rename from internal/control/planner_gate_test.go rename to internal/session/control/planner_gate_test.go index 08e4dcb701..28868230fc 100644 --- a/internal/control/planner_gate_test.go +++ b/internal/session/control/planner_gate_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) func warrantsPlanner(t *testing.T, input string) bool { diff --git a/internal/control/port.go b/internal/session/control/port.go similarity index 96% rename from internal/control/port.go rename to internal/session/control/port.go index 736fae359d..01ff8ea138 100644 --- a/internal/control/port.go +++ b/internal/session/control/port.go @@ -3,20 +3,20 @@ package control import ( "context" - "reasonix/internal/agent" - "reasonix/internal/billing" - "reasonix/internal/browser" - "reasonix/internal/checkpoint" - "reasonix/internal/command" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/hook" - "reasonix/internal/jobs" - "reasonix/internal/memory" - "reasonix/internal/plugin" - "reasonix/internal/provider" - "reasonix/internal/skill" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/command" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/plugin" + "reasonix/internal/ext/skill" + "reasonix/internal/model/billing" + "reasonix/internal/platform/browser" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" + "reasonix/internal/state/checkpoint" + "reasonix/internal/state/memory" ) // This file defines the driving port: the typed, segregated interface surface diff --git a/internal/control/port_segregation_test.go b/internal/session/control/port_segregation_test.go similarity index 100% rename from internal/control/port_segregation_test.go rename to internal/session/control/port_segregation_test.go diff --git a/internal/control/prefix.go b/internal/session/control/prefix.go similarity index 95% rename from internal/control/prefix.go rename to internal/session/control/prefix.go index fcb4dfdad6..0d8e6b2491 100644 --- a/internal/control/prefix.go +++ b/internal/session/control/prefix.go @@ -3,7 +3,7 @@ // usage events report. package control -import "reasonix/internal/provider" +import "reasonix/internal/contract/provider" // SystemPrompt returns the base system prompt sessions are seeded with. With // ToolSchemas it is what the cache hashes cover, so a recorder that persists diff --git a/internal/control/producer_attribution_test.go b/internal/session/control/producer_attribution_test.go similarity index 92% rename from internal/control/producer_attribution_test.go rename to internal/session/control/producer_attribution_test.go index 4053af09f1..caea7c2b9c 100644 --- a/internal/control/producer_attribution_test.go +++ b/internal/session/control/producer_attribution_test.go @@ -6,13 +6,13 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/agent/testutil" ) // TestTwoModelTurnSaysWhichModelWroteEachFrame runs a real plan-and-execute turn diff --git a/internal/control/project_modules.go b/internal/session/control/project_modules.go similarity index 100% rename from internal/control/project_modules.go rename to internal/session/control/project_modules.go diff --git a/internal/control/projection_bind.go b/internal/session/control/projection_bind.go similarity index 96% rename from internal/control/projection_bind.go rename to internal/session/control/projection_bind.go index 72606a60d3..fc693d0c47 100644 --- a/internal/control/projection_bind.go +++ b/internal/session/control/projection_bind.go @@ -5,8 +5,8 @@ import ( "log/slog" "time" - "reasonix/internal/agent" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" ) // bindExecutorProjection rebinds the agent's projection sidecar to path. diff --git a/internal/control/projection_bind_test.go b/internal/session/control/projection_bind_test.go similarity index 97% rename from internal/control/projection_bind_test.go rename to internal/session/control/projection_bind_test.go index 30f0eb572b..7f3bc3ec45 100644 --- a/internal/control/projection_bind_test.go +++ b/internal/session/control/projection_bind_test.go @@ -3,10 +3,10 @@ package control import ( "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func TestNewSessionRebindsProjectionSidecarPath(t *testing.T) { diff --git a/internal/control/projection_debt.go b/internal/session/control/projection_debt.go similarity index 100% rename from internal/control/projection_debt.go rename to internal/session/control/projection_debt.go diff --git a/internal/control/prompt_ids_test.go b/internal/session/control/prompt_ids_test.go similarity index 97% rename from internal/control/prompt_ids_test.go rename to internal/session/control/prompt_ids_test.go index 351234b7bc..6a1ccbca73 100644 --- a/internal/control/prompt_ids_test.go +++ b/internal/session/control/prompt_ids_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // A controller rebuilt for a model switch or a reload keeps the pane's event diff --git a/internal/control/prompt_refine.go b/internal/session/control/prompt_refine.go similarity index 93% rename from internal/control/prompt_refine.go rename to internal/session/control/prompt_refine.go index 16f66ad162..0e6f008f07 100644 --- a/internal/control/prompt_refine.go +++ b/internal/session/control/prompt_refine.go @@ -4,8 +4,8 @@ import ( "context" "path/filepath" - "reasonix/internal/promptrefine" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/promptrefine" ) // RefinePrompt rewrites a draft into a clearer request with the session's own diff --git a/internal/control/prompt_refine_test.go b/internal/session/control/prompt_refine_test.go similarity index 95% rename from internal/control/prompt_refine_test.go rename to internal/session/control/prompt_refine_test.go index 3e1309710e..c80a0a32f0 100644 --- a/internal/control/prompt_refine_test.go +++ b/internal/session/control/prompt_refine_test.go @@ -3,7 +3,7 @@ package control import ( "testing" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) // What a draft can refer to is what the person and the model said; tool diff --git a/internal/control/readiness_continuation.go b/internal/session/control/readiness_continuation.go similarity index 97% rename from internal/control/readiness_continuation.go rename to internal/session/control/readiness_continuation.go index f05fbbaffe..df56936961 100644 --- a/internal/control/readiness_continuation.go +++ b/internal/session/control/readiness_continuation.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/evidence" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" ) // A turn that ends owing verification has not failed: the host read what is diff --git a/internal/control/readiness_continuation_test.go b/internal/session/control/readiness_continuation_test.go similarity index 98% rename from internal/control/readiness_continuation_test.go rename to internal/session/control/readiness_continuation_test.go index 0fca086c21..daed3cb9f9 100644 --- a/internal/control/readiness_continuation_test.go +++ b/internal/session/control/readiness_continuation_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" ) // readinessDeliveryController wires a Delivery agent to a scripted provider, so diff --git a/internal/control/recovery.go b/internal/session/control/recovery.go similarity index 99% rename from internal/control/recovery.go rename to internal/session/control/recovery.go index 9d72c1699d..5ca7c9052e 100644 --- a/internal/control/recovery.go +++ b/internal/session/control/recovery.go @@ -8,8 +8,8 @@ import ( "strings" "unicode/utf8" - "reasonix/internal/agent" - "reasonix/internal/recovery" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/recovery" ) // ResolveRecovery applies a user decision on an Auto Guard card. diff --git a/internal/control/recovery_e2e_test.go b/internal/session/control/recovery_e2e_test.go similarity index 92% rename from internal/control/recovery_e2e_test.go rename to internal/session/control/recovery_e2e_test.go index 73715039d7..5dd11a1939 100644 --- a/internal/control/recovery_e2e_test.go +++ b/internal/session/control/recovery_e2e_test.go @@ -7,13 +7,13 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/recovery" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/recovery" + "reasonix/internal/safety/permission" ) // End-to-end: scripted provider fails verification, runs read-only diagnosis, diff --git a/internal/control/recovery_test.go b/internal/session/control/recovery_test.go similarity index 98% rename from internal/control/recovery_test.go rename to internal/session/control/recovery_test.go index 8f4b6a8945..be8c276861 100644 --- a/internal/control/recovery_test.go +++ b/internal/session/control/recovery_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/recovery" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/recovery" + "reasonix/internal/safety/permission" ) type recoveryWriteTool struct { diff --git a/internal/control/refimages.go b/internal/session/control/refimages.go similarity index 98% rename from internal/control/refimages.go rename to internal/session/control/refimages.go index 2f6a432068..10db9f55be 100644 --- a/internal/control/refimages.go +++ b/internal/session/control/refimages.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "reasonix/internal/visionimage" + "reasonix/internal/model/visionimage" ) // inputImages resolves image @-references in the turn input to data URLs so the diff --git a/internal/control/refs.go b/internal/session/control/refs.go similarity index 99% rename from internal/control/refs.go rename to internal/session/control/refs.go index c96c3e351b..6548051c59 100644 --- a/internal/control/refs.go +++ b/internal/session/control/refs.go @@ -18,11 +18,11 @@ import ( "strings" "time" - "reasonix/internal/fileref" - "reasonix/internal/fileutil" - "reasonix/internal/instruction" - "reasonix/internal/proc" - "reasonix/internal/secrets" + "reasonix/internal/base/fileref" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" + "reasonix/internal/state/instruction" ) // maxFileRefBytes caps how much of an @-referenced file is injected into a diff --git a/internal/control/refs_test.go b/internal/session/control/refs_test.go similarity index 99% rename from internal/control/refs_test.go rename to internal/session/control/refs_test.go index d2ac7374fb..355c3cc331 100644 --- a/internal/control/refs_test.go +++ b/internal/session/control/refs_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/memory" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/memory" ) func TestResolveRefsInjectsOnlyNewNestedInstructionsOnce(t *testing.T) { diff --git a/internal/control/refusal_hint_test.go b/internal/session/control/refusal_hint_test.go similarity index 95% rename from internal/control/refusal_hint_test.go rename to internal/session/control/refusal_hint_test.go index f21712b668..7d3e29fc70 100644 --- a/internal/control/refusal_hint_test.go +++ b/internal/session/control/refusal_hint_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/i18n" - "reasonix/internal/provider" - "reasonix/internal/provider/openai" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/provider" + "reasonix/internal/model/openai" ) // The whole point of the hint is that it survives: the only place that knows diff --git a/internal/control/replay_pending_test.go b/internal/session/control/replay_pending_test.go similarity index 98% rename from internal/control/replay_pending_test.go rename to internal/session/control/replay_pending_test.go index d461327ced..df35543ccb 100644 --- a/internal/control/replay_pending_test.go +++ b/internal/session/control/replay_pending_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // TestReplayPendingPromptsReEmitsBlockedApproval proves a tool approval that is diff --git a/internal/control/response_format_test.go b/internal/session/control/response_format_test.go similarity index 98% rename from internal/control/response_format_test.go rename to internal/session/control/response_format_test.go index a536dcde31..9b1d896393 100644 --- a/internal/control/response_format_test.go +++ b/internal/session/control/response_format_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" ) func TestIsNonTurnHTTPInput(t *testing.T) { diff --git a/internal/control/resume_prune_test.go b/internal/session/control/resume_prune_test.go similarity index 97% rename from internal/control/resume_prune_test.go rename to internal/session/control/resume_prune_test.go index 1164d22d16..0daa15a194 100644 --- a/internal/control/resume_prune_test.go +++ b/internal/session/control/resume_prune_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func coldResumeFixture(t *testing.T, threshold time.Duration) (*agent.Session, string, *Controller) { diff --git a/internal/control/rewind.go b/internal/session/control/rewind.go similarity index 98% rename from internal/control/rewind.go rename to internal/session/control/rewind.go index 1b3f0eaeac..1e49e7f5a0 100644 --- a/internal/control/rewind.go +++ b/internal/session/control/rewind.go @@ -7,10 +7,10 @@ import ( "log/slog" "sync/atomic" - "reasonix/internal/checkpoint" - "reasonix/internal/diff" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/base/diff" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/state/checkpoint" ) // ErrRewindCoverageConfirmationRequired is returned by the compatibility diff --git a/internal/control/rewind_e2e_test.go b/internal/session/control/rewind_e2e_test.go similarity index 98% rename from internal/control/rewind_e2e_test.go rename to internal/session/control/rewind_e2e_test.go index 0223c106a7..0b29b8254b 100644 --- a/internal/control/rewind_e2e_test.go +++ b/internal/session/control/rewind_e2e_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/checkpoint" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/checkpoint" ) func TestCompatibilityRewindRequiresConfirmationForPartialCoverage(t *testing.T) { diff --git a/internal/control/rule_allows_test.go b/internal/session/control/rule_allows_test.go similarity index 97% rename from internal/control/rule_allows_test.go rename to internal/session/control/rule_allows_test.go index 8c8b5b9d65..219031615e 100644 --- a/internal/control/rule_allows_test.go +++ b/internal/session/control/rule_allows_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "reasonix/internal/permission" + "reasonix/internal/safety/permission" ) func bashCall(t *testing.T, command string) json.RawMessage { diff --git a/internal/control/run_ceiling.go b/internal/session/control/run_ceiling.go similarity index 94% rename from internal/control/run_ceiling.go rename to internal/session/control/run_ceiling.go index 7ff408c697..c1f711207d 100644 --- a/internal/control/run_ceiling.go +++ b/internal/session/control/run_ceiling.go @@ -3,8 +3,8 @@ package control import ( "context" - "reasonix/internal/agent" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) // bindTurnScope binds a Goal turn's spend budget and its usage recorder, the diff --git a/internal/control/runtime_status_test.go b/internal/session/control/runtime_status_test.go similarity index 99% rename from internal/control/runtime_status_test.go rename to internal/session/control/runtime_status_test.go index 92417c2f02..f14e491745 100644 --- a/internal/control/runtime_status_test.go +++ b/internal/session/control/runtime_status_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) type approvalBlockingRunner struct { diff --git a/internal/control/session_artifacts_test.go b/internal/session/control/session_artifacts_test.go similarity index 90% rename from internal/control/session_artifacts_test.go rename to internal/session/control/session_artifacts_test.go index fe17c6416f..8d7c6ef387 100644 --- a/internal/control/session_artifacts_test.go +++ b/internal/session/control/session_artifacts_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/guardian" - "reasonix/internal/provider" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/guardian" + "reasonix/internal/state/store" ) // /clear must not leave the event log behind: it is the authoritative diff --git a/internal/control/session_destroy.go b/internal/session/control/session_destroy.go similarity index 95% rename from internal/control/session_destroy.go rename to internal/session/control/session_destroy.go index 02d579567c..f17f87243c 100644 --- a/internal/control/session_destroy.go +++ b/internal/session/control/session_destroy.go @@ -4,8 +4,8 @@ import ( "context" "time" - "reasonix/internal/agent" - "reasonix/internal/jobs" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" ) // SessionDestroyHandle separates cancelled-job waiting from ending the destroy diff --git a/internal/control/session_grant_test.go b/internal/session/control/session_grant_test.go similarity index 98% rename from internal/control/session_grant_test.go rename to internal/session/control/session_grant_test.go index e7ce91938a..f8ee22efb8 100644 --- a/internal/control/session_grant_test.go +++ b/internal/session/control/session_grant_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "reasonix/internal/permission" + "reasonix/internal/safety/permission" ) // A grant given on a prompt lives in memory and in nothing else, so a person diff --git a/internal/control/session_lease_keeper.go b/internal/session/control/session_lease_keeper.go similarity index 99% rename from internal/control/session_lease_keeper.go rename to internal/session/control/session_lease_keeper.go index 519060a147..fce68fa42c 100644 --- a/internal/control/session_lease_keeper.go +++ b/internal/session/control/session_lease_keeper.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // SessionLeaseKeeper owns at most one session lease on behalf of a frontend diff --git a/internal/control/session_lease_keeper_test.go b/internal/session/control/session_lease_keeper_test.go similarity index 97% rename from internal/control/session_lease_keeper_test.go rename to internal/session/control/session_lease_keeper_test.go index 391b5b0383..f1bc7bb133 100644 --- a/internal/control/session_lease_keeper_test.go +++ b/internal/session/control/session_lease_keeper_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) func TestSessionLeaseKeeperRebindMovesLease(t *testing.T) { diff --git a/internal/control/session_lease_reclaim_test.go b/internal/session/control/session_lease_reclaim_test.go similarity index 98% rename from internal/control/session_lease_reclaim_test.go rename to internal/session/control/session_lease_reclaim_test.go index 1d0e0addb5..e15fb58c74 100644 --- a/internal/control/session_lease_reclaim_test.go +++ b/internal/session/control/session_lease_reclaim_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/runtime/agent" ) func leasePath(t *testing.T, name string) string { diff --git a/internal/control/session_lifecycle.go b/internal/session/control/session_lifecycle.go similarity index 98% rename from internal/control/session_lifecycle.go rename to internal/session/control/session_lifecycle.go index 4fb603725f..2d11bb1930 100644 --- a/internal/control/session_lifecycle.go +++ b/internal/session/control/session_lifecycle.go @@ -7,14 +7,14 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/browser" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/guardian" - "reasonix/internal/provider" - "reasonix/internal/sessiontemp" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/platform/browser" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/guardian" + "reasonix/internal/state/sessiontemp" ) // SetOnSessionRecovered installs the ownership handoff invoked before the diff --git a/internal/control/session_readonly_attach_test.go b/internal/session/control/session_readonly_attach_test.go similarity index 97% rename from internal/control/session_readonly_attach_test.go rename to internal/session/control/session_readonly_attach_test.go index 9cbd8ddeb7..0089fddab5 100644 --- a/internal/control/session_readonly_attach_test.go +++ b/internal/session/control/session_readonly_attach_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func seedTranscript(t *testing.T, path string, text string) { diff --git a/internal/control/session_snapshot.go b/internal/session/control/session_snapshot.go similarity index 98% rename from internal/control/session_snapshot.go rename to internal/session/control/session_snapshot.go index 397075c660..fd85d6eff3 100644 --- a/internal/control/session_snapshot.go +++ b/internal/session/control/session_snapshot.go @@ -11,15 +11,15 @@ import ( "sync/atomic" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/extension/dispatch" - "reasonix/internal/guardian" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/sessioninbox" - "reasonix/internal/store" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/extension/dispatch" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" + "reasonix/internal/safety/guardian" + "reasonix/internal/state/sessioninbox" + "reasonix/internal/state/store" ) // Snapshot writes the executor's conversation to the active session file. No-op diff --git a/internal/control/session_temp_test.go b/internal/session/control/session_temp_test.go similarity index 97% rename from internal/control/session_temp_test.go rename to internal/session/control/session_temp_test.go index 766c959e33..b6bafa6503 100644 --- a/internal/control/session_temp_test.go +++ b/internal/session/control/session_temp_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/sessiontemp" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/sessiontemp" ) func TestSessionTempSurvivesHotRebuildStyleRetain(t *testing.T) { diff --git a/internal/control/session_write_authority.go b/internal/session/control/session_write_authority.go similarity index 97% rename from internal/control/session_write_authority.go rename to internal/session/control/session_write_authority.go index 1caa2d3b29..ed84b27478 100644 --- a/internal/control/session_write_authority.go +++ b/internal/session/control/session_write_authority.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "reasonix/internal/agent" - "reasonix/internal/event" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" ) // BindSessionWriteAuthority issues a generation-bound write authority from diff --git a/internal/control/session_write_authority_admission_test.go b/internal/session/control/session_write_authority_admission_test.go similarity index 96% rename from internal/control/session_write_authority_admission_test.go rename to internal/session/control/session_write_authority_admission_test.go index a5fc3ac8d7..53e394d38a 100644 --- a/internal/control/session_write_authority_admission_test.go +++ b/internal/session/control/session_write_authority_admission_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/sessioninbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/sessioninbox" ) func TestStaleWriteAuthorityBlocksAsyncAdmission(t *testing.T) { diff --git a/internal/control/sessionpath.go b/internal/session/control/sessionpath.go similarity index 97% rename from internal/control/sessionpath.go rename to internal/session/control/sessionpath.go index 77fd7cac4b..f02d0eb242 100644 --- a/internal/control/sessionpath.go +++ b/internal/session/control/sessionpath.go @@ -1,8 +1,8 @@ package control import ( - "reasonix/internal/agent" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // EnsureSessionPath pins a fresh auto-save file for this controller when none is diff --git a/internal/control/shell.go b/internal/session/control/shell.go similarity index 96% rename from internal/control/shell.go rename to internal/session/control/shell.go index d77119d1e4..f4f0bbbdf8 100644 --- a/internal/control/shell.go +++ b/internal/session/control/shell.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "reasonix/internal/config" - "reasonix/internal/sandbox" - "reasonix/internal/shellrun" - "reasonix/internal/tool" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" + "reasonix/internal/tools/shellrun" ) // ShellOption is one interpreter this machine actually has. Path is what the diff --git a/internal/control/shell_kill_other.go b/internal/session/control/shell_kill_other.go similarity index 100% rename from internal/control/shell_kill_other.go rename to internal/session/control/shell_kill_other.go diff --git a/internal/control/shell_kill_other_test.go b/internal/session/control/shell_kill_other_test.go similarity index 100% rename from internal/control/shell_kill_other_test.go rename to internal/session/control/shell_kill_other_test.go diff --git a/internal/control/shell_kill_windows.go b/internal/session/control/shell_kill_windows.go similarity index 95% rename from internal/control/shell_kill_windows.go rename to internal/session/control/shell_kill_windows.go index 56ce22989a..4f996c3e0b 100644 --- a/internal/control/shell_kill_windows.go +++ b/internal/session/control/shell_kill_windows.go @@ -6,7 +6,7 @@ import ( "os/exec" "strconv" - "reasonix/internal/proc" + "reasonix/internal/base/proc" ) // setShellKillTree hides the child's console and makes a cancelled command kill diff --git a/internal/control/shell_settings_test.go b/internal/session/control/shell_settings_test.go similarity index 98% rename from internal/control/shell_settings_test.go rename to internal/session/control/shell_settings_test.go index b0cd956710..6ed80767af 100644 --- a/internal/control/shell_settings_test.go +++ b/internal/session/control/shell_settings_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) const shellSeedConfig = `config_version = 6 diff --git a/internal/control/shell_test.go b/internal/session/control/shell_test.go similarity index 98% rename from internal/control/shell_test.go rename to internal/session/control/shell_test.go index 9e2ed507eb..cff8a9d0de 100644 --- a/internal/control/shell_test.go +++ b/internal/session/control/shell_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/i18n" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/i18n" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/safety/sandbox" ) // collectSink returns a Sink that collects events, a channel carrying TurnDone diff --git a/internal/control/skill.go b/internal/session/control/skill.go similarity index 99% rename from internal/control/skill.go rename to internal/session/control/skill.go index 7eed5a2928..f61b831879 100644 --- a/internal/control/skill.go +++ b/internal/session/control/skill.go @@ -4,8 +4,8 @@ import ( "fmt" "sync/atomic" - "reasonix/internal/config" - "reasonix/internal/skill" + "reasonix/internal/contract/config" + "reasonix/internal/ext/skill" ) // skillSet owns the session's discovered skills: the enabled subset surfaced to diff --git a/internal/control/skill_catalog_test.go b/internal/session/control/skill_catalog_test.go similarity index 96% rename from internal/control/skill_catalog_test.go rename to internal/session/control/skill_catalog_test.go index cfc268a851..0bc07722d5 100644 --- a/internal/control/skill_catalog_test.go +++ b/internal/session/control/skill_catalog_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/skill" + "reasonix/internal/contract/event" + "reasonix/internal/ext/skill" ) // The listing is delivered once, on a user turn. A fold can summarise that turn diff --git a/internal/control/slash.go b/internal/session/control/slash.go similarity index 99% rename from internal/control/slash.go rename to internal/session/control/slash.go index 84f83fc1bc..25d30b3472 100644 --- a/internal/control/slash.go +++ b/internal/session/control/slash.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "reasonix/internal/config" - "reasonix/internal/i18n" - "reasonix/internal/migration" - "reasonix/internal/pluginpkg" - "reasonix/internal/skill" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/ext/skill" + "reasonix/internal/state/migration" ) // SlashItem is one slash-completion suggestion. Insert is the token text placed diff --git a/internal/control/slash_catalog.go b/internal/session/control/slash_catalog.go similarity index 97% rename from internal/control/slash_catalog.go rename to internal/session/control/slash_catalog.go index 18a5e7cce4..1cd65d375f 100644 --- a/internal/control/slash_catalog.go +++ b/internal/session/control/slash_catalog.go @@ -3,11 +3,11 @@ package control import ( "strings" - "reasonix/internal/command" - "reasonix/internal/config" - "reasonix/internal/i18n" - "reasonix/internal/pluginpkg" - "reasonix/internal/skill" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/ext/command" + "reasonix/internal/ext/pluginpkg" + "reasonix/internal/ext/skill" ) // SubmitSlashCommands is the built-in surface a frontend gets for free by diff --git a/internal/control/slash_resolution.go b/internal/session/control/slash_resolution.go similarity index 97% rename from internal/control/slash_resolution.go rename to internal/session/control/slash_resolution.go index 6c2ebf6c1d..da2625a452 100644 --- a/internal/control/slash_resolution.go +++ b/internal/session/control/slash_resolution.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/command" - "reasonix/internal/skill" + "reasonix/internal/ext/command" + "reasonix/internal/ext/skill" ) const ( diff --git a/internal/control/slash_resolution_test.go b/internal/session/control/slash_resolution_test.go similarity index 97% rename from internal/control/slash_resolution_test.go rename to internal/session/control/slash_resolution_test.go index e18c3a8f77..64ad317680 100644 --- a/internal/control/slash_resolution_test.go +++ b/internal/session/control/slash_resolution_test.go @@ -3,8 +3,8 @@ package control import ( "testing" - "reasonix/internal/command" - "reasonix/internal/skill" + "reasonix/internal/ext/command" + "reasonix/internal/ext/skill" ) func TestResolvedBuiltinDocsSlashNameMatchesRuntimeOwner(t *testing.T) { diff --git a/internal/control/slash_test.go b/internal/session/control/slash_test.go similarity index 99% rename from internal/control/slash_test.go rename to internal/session/control/slash_test.go index 528af266fc..251686778c 100644 --- a/internal/control/slash_test.go +++ b/internal/session/control/slash_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/instruction" - "reasonix/internal/memory" - "reasonix/internal/skill" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/ext/skill" + "reasonix/internal/state/instruction" + "reasonix/internal/state/memory" ) func labelsOf(items []SlashItem) []string { diff --git a/internal/control/snapshot_conflict_diagnostic.go b/internal/session/control/snapshot_conflict_diagnostic.go similarity index 97% rename from internal/control/snapshot_conflict_diagnostic.go rename to internal/session/control/snapshot_conflict_diagnostic.go index cd68fcc349..93d63cd6d7 100644 --- a/internal/control/snapshot_conflict_diagnostic.go +++ b/internal/session/control/snapshot_conflict_diagnostic.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "reasonix/internal/agent" - "reasonix/internal/store" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) type snapshotConflictDiagnostic struct { diff --git a/internal/control/snapshot_same_revision.go b/internal/session/control/snapshot_same_revision.go similarity index 98% rename from internal/control/snapshot_same_revision.go rename to internal/session/control/snapshot_same_revision.go index 5eac009f8b..c8a5df592d 100644 --- a/internal/control/snapshot_same_revision.go +++ b/internal/session/control/snapshot_same_revision.go @@ -4,7 +4,7 @@ import ( "errors" "log/slog" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // persistSessionSnapshot writes path with snapshot semantics, escalating to an diff --git a/internal/control/steer_delivery_test.go b/internal/session/control/steer_delivery_test.go similarity index 94% rename from internal/control/steer_delivery_test.go rename to internal/session/control/steer_delivery_test.go index 8e43e58afe..987ca982f5 100644 --- a/internal/control/steer_delivery_test.go +++ b/internal/session/control/steer_delivery_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/sessioninbox" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/sessioninbox" ) // haltingText holds the first turn open until the test releases it, which is diff --git a/internal/control/steer_fallback_test.go b/internal/session/control/steer_fallback_test.go similarity index 96% rename from internal/control/steer_fallback_test.go rename to internal/session/control/steer_fallback_test.go index fc7ea4da46..3776dba1cc 100644 --- a/internal/control/steer_fallback_test.go +++ b/internal/session/control/steer_fallback_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" ) func steerFallbackController(t *testing.T) (*Controller, *agent.Agent) { diff --git a/internal/control/subagent_goal_work_duration_test.go b/internal/session/control/subagent_goal_work_duration_test.go similarity index 94% rename from internal/control/subagent_goal_work_duration_test.go rename to internal/session/control/subagent_goal_work_duration_test.go index 587ab5a4fb..090d55ddaa 100644 --- a/internal/control/subagent_goal_work_duration_test.go +++ b/internal/session/control/subagent_goal_work_duration_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" ) func TestSubagentSkillGoalRecordsWorkDuration(t *testing.T) { diff --git a/internal/control/synchronous_turn.go b/internal/session/control/synchronous_turn.go similarity index 95% rename from internal/control/synchronous_turn.go rename to internal/session/control/synchronous_turn.go index 467c5f7804..b3289d4390 100644 --- a/internal/control/synchronous_turn.go +++ b/internal/session/control/synchronous_turn.go @@ -3,8 +3,8 @@ package control import ( "context" - "reasonix/internal/event" - "reasonix/internal/extension" + "reasonix/internal/contract/event" + "reasonix/internal/ext/extension" ) // runSynchronousTurn owns the blocking transport lifecycle. Durable steer diff --git a/internal/control/tool_issuer_test.go b/internal/session/control/tool_issuer_test.go similarity index 98% rename from internal/control/tool_issuer_test.go rename to internal/session/control/tool_issuer_test.go index d333bd8889..1b77ffce07 100644 --- a/internal/control/tool_issuer_test.go +++ b/internal/session/control/tool_issuer_test.go @@ -3,7 +3,7 @@ package control import ( "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) // collectTools runs fn and returns the tool frames it emitted, in order. diff --git a/internal/control/turn_boundary_matrix_test.go b/internal/session/control/turn_boundary_matrix_test.go similarity index 97% rename from internal/control/turn_boundary_matrix_test.go rename to internal/session/control/turn_boundary_matrix_test.go index 82c4979e2b..f204c36148 100644 --- a/internal/control/turn_boundary_matrix_test.go +++ b/internal/session/control/turn_boundary_matrix_test.go @@ -6,13 +6,13 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/agent/testutil" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/agent/testutil" ) // visibleTurnWork is the model's own output. A turn's identity has to exist diff --git a/internal/control/turn_cancel.go b/internal/session/control/turn_cancel.go similarity index 99% rename from internal/control/turn_cancel.go rename to internal/session/control/turn_cancel.go index b5bed1a0d1..4d47bfe8e1 100644 --- a/internal/control/turn_cancel.go +++ b/internal/session/control/turn_cancel.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/ext/extension" + "reasonix/internal/runtime/agent" ) // spawnGuardedTurn launches an admitted turn body plus its autosave companion. diff --git a/internal/control/turn_checkpoint_event_test.go b/internal/session/control/turn_checkpoint_event_test.go similarity index 98% rename from internal/control/turn_checkpoint_event_test.go rename to internal/session/control/turn_checkpoint_event_test.go index 1dd4537b85..496860fac4 100644 --- a/internal/control/turn_checkpoint_event_test.go +++ b/internal/session/control/turn_checkpoint_event_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) type checkpointEventRunner struct { diff --git a/internal/control/turn_completion_test.go b/internal/session/control/turn_completion_test.go similarity index 98% rename from internal/control/turn_completion_test.go rename to internal/session/control/turn_completion_test.go index 9872117010..297d3c79b5 100644 --- a/internal/control/turn_completion_test.go +++ b/internal/session/control/turn_completion_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "reasonix/internal/event" + "reasonix/internal/contract/event" ) type completionCountingSink struct { diff --git a/internal/control/turn_entry.go b/internal/session/control/turn_entry.go similarity index 97% rename from internal/control/turn_entry.go rename to internal/session/control/turn_entry.go index 01fb40dac9..eb07712eef 100644 --- a/internal/control/turn_entry.go +++ b/internal/session/control/turn_entry.go @@ -11,13 +11,13 @@ import ( "slices" "strings" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/extension" - "reasonix/internal/jobs" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/extension" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/jobs" ) func turnOutcome(err error) string { diff --git a/internal/control/turn_gate.go b/internal/session/control/turn_gate.go similarity index 100% rename from internal/control/turn_gate.go rename to internal/session/control/turn_gate.go diff --git a/internal/control/turn_identity_test.go b/internal/session/control/turn_identity_test.go similarity index 93% rename from internal/control/turn_identity_test.go rename to internal/session/control/turn_identity_test.go index 0d1faac651..82539c3f00 100644 --- a/internal/control/turn_identity_test.go +++ b/internal/session/control/turn_identity_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" ) type turnIdentityProvider struct{} diff --git a/internal/control/turn_images.go b/internal/session/control/turn_images.go similarity index 98% rename from internal/control/turn_images.go rename to internal/session/control/turn_images.go index 745327b9c0..9904e48435 100644 --- a/internal/control/turn_images.go +++ b/internal/session/control/turn_images.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" + "reasonix/internal/contract/config" + "reasonix/internal/runtime/agent" ) // turnImages is what became of this turn's attachments: what the model gets, diff --git a/internal/control/turn_images_test.go b/internal/session/control/turn_images_test.go similarity index 98% rename from internal/control/turn_images_test.go rename to internal/session/control/turn_images_test.go index 03c3a3e219..1d3e9097ff 100644 --- a/internal/control/turn_images_test.go +++ b/internal/session/control/turn_images_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/event" - "reasonix/internal/testenv" - "reasonix/internal/visionimage" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/model/visionimage" ) // A pasted screenshot that reaches a text-only model must not vanish. The data diff --git a/internal/control/turn_orchestrator.go b/internal/session/control/turn_orchestrator.go similarity index 98% rename from internal/control/turn_orchestrator.go rename to internal/session/control/turn_orchestrator.go index b96e7ffd49..e73a6ecd90 100644 --- a/internal/control/turn_orchestrator.go +++ b/internal/session/control/turn_orchestrator.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/jobs" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" ) // turnOrchestrator owns foreground turn execution while Controller keeps the diff --git a/internal/control/turn_orchestrator_test.go b/internal/session/control/turn_orchestrator_test.go similarity index 99% rename from internal/control/turn_orchestrator_test.go rename to internal/session/control/turn_orchestrator_test.go index c659fd3821..d312ab1884 100644 --- a/internal/control/turn_orchestrator_test.go +++ b/internal/session/control/turn_orchestrator_test.go @@ -10,15 +10,15 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/capability" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/hook" - "reasonix/internal/provider" - "reasonix/internal/skill" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/ext/hook" + "reasonix/internal/ext/skill" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/capability" + "reasonix/internal/runtime/evidence" ) type plannerMetadataRunner struct { diff --git a/internal/control/turn_projection.go b/internal/session/control/turn_projection.go similarity index 97% rename from internal/control/turn_projection.go rename to internal/session/control/turn_projection.go index 556c0eb69d..068a35f2d7 100644 --- a/internal/control/turn_projection.go +++ b/internal/session/control/turn_projection.go @@ -5,10 +5,10 @@ import ( "errors" "strings" - "reasonix/internal/ablation" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/memory" + "reasonix/internal/contract/ablation" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/memory" ) // turnBlock is one host-owned block on a user turn: the transient tag it is diff --git a/internal/control/turn_projection_test.go b/internal/session/control/turn_projection_test.go similarity index 98% rename from internal/control/turn_projection_test.go rename to internal/session/control/turn_projection_test.go index 37eb6d47b0..d9f0a0ea34 100644 --- a/internal/control/turn_projection_test.go +++ b/internal/session/control/turn_projection_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) // The order blocks are declared in is the order the model reads them, so it is diff --git a/internal/control/turn_submit.go b/internal/session/control/turn_submit.go similarity index 99% rename from internal/control/turn_submit.go rename to internal/session/control/turn_submit.go index 754d804401..043c5c4a63 100644 --- a/internal/control/turn_submit.go +++ b/internal/session/control/turn_submit.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "reasonix/internal/i18n" - "reasonix/internal/skill" + "reasonix/internal/base/i18n" + "reasonix/internal/ext/skill" ) // Submit is the one-call entry for a simple frontend: it takes raw user input diff --git a/internal/control/usage_tally.go b/internal/session/control/usage_tally.go similarity index 97% rename from internal/control/usage_tally.go rename to internal/session/control/usage_tally.go index 4473314a6a..199f49064d 100644 --- a/internal/control/usage_tally.go +++ b/internal/session/control/usage_tally.go @@ -5,8 +5,8 @@ import ( "strings" "sync" - "reasonix/internal/event" - "reasonix/internal/usagereport" + "reasonix/internal/contract/event" + "reasonix/internal/state/usagereport" ) // usageTally accumulates the session's billed tokens off the event stream. It diff --git a/internal/control/usage_tally_test.go b/internal/session/control/usage_tally_test.go similarity index 96% rename from internal/control/usage_tally_test.go rename to internal/session/control/usage_tally_test.go index 6861b5c3b1..6f45bf9e70 100644 --- a/internal/control/usage_tally_test.go +++ b/internal/session/control/usage_tally_test.go @@ -4,10 +4,10 @@ import ( "path/filepath" "testing" - "reasonix/internal/event" - "reasonix/internal/provider" - "reasonix/internal/testenv" - "reasonix/internal/usagereport" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/state/usagereport" ) func usageEvent(source string, prompt, hit, miss int) event.Event { diff --git a/internal/control/user_gate.go b/internal/session/control/user_gate.go similarity index 97% rename from internal/control/user_gate.go rename to internal/session/control/user_gate.go index 8017904a75..d9cea90e13 100644 --- a/internal/control/user_gate.go +++ b/internal/session/control/user_gate.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "reasonix/internal/i18n" + "reasonix/internal/base/i18n" ) // Two host decisions follow from a turn having recorded a user gate: the Goal diff --git a/internal/control/user_gate_test.go b/internal/session/control/user_gate_test.go similarity index 96% rename from internal/control/user_gate_test.go rename to internal/session/control/user_gate_test.go index cd739388e8..4866bc70e8 100644 --- a/internal/control/user_gate_test.go +++ b/internal/session/control/user_gate_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/runtime/evidence" ) // The Goal loop is what would otherwise drive through a gate. It must stop, and diff --git a/internal/control/workspace_lease.go b/internal/session/control/workspace_lease.go similarity index 92% rename from internal/control/workspace_lease.go rename to internal/session/control/workspace_lease.go index ec0fa38d19..4b1fb1137a 100644 --- a/internal/control/workspace_lease.go +++ b/internal/session/control/workspace_lease.go @@ -1,7 +1,7 @@ // workspace_lease.go — what a controller says about the workspace write lease. package control -import "reasonix/internal/workspacelease" +import "reasonix/internal/state/workspacelease" // WorkspaceLeaseState reports only whether this controller owns or is waiting // for the Delivery workspace writer lease. It never exposes filesystem or diff --git a/internal/control/yolo_test.go b/internal/session/control/yolo_test.go similarity index 99% rename from internal/control/yolo_test.go rename to internal/session/control/yolo_test.go index 43f7c656a0..0a1c6e1ac5 100644 --- a/internal/control/yolo_test.go +++ b/internal/session/control/yolo_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "reasonix/internal/agent" - "reasonix/internal/event" - "reasonix/internal/permission" - "reasonix/internal/provider" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/agent" + "reasonix/internal/safety/permission" + "reasonix/internal/safety/sandbox" ) // TestAutoApproveToolsStillRequiresExplicitPlanApproval proves that YOLO/full diff --git a/internal/checkpoint/atomic_json.go b/internal/state/checkpoint/atomic_json.go similarity index 95% rename from internal/checkpoint/atomic_json.go rename to internal/state/checkpoint/atomic_json.go index 1f31c5443e..6b6683c927 100644 --- a/internal/checkpoint/atomic_json.go +++ b/internal/state/checkpoint/atomic_json.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // writeJSONAtomic marshals v and publishes it via AtomicWriteFileStrict. diff --git a/internal/checkpoint/barrier.go b/internal/state/checkpoint/barrier.go similarity index 100% rename from internal/checkpoint/barrier.go rename to internal/state/checkpoint/barrier.go diff --git a/internal/checkpoint/blob.go b/internal/state/checkpoint/blob.go similarity index 99% rename from internal/checkpoint/blob.go rename to internal/state/checkpoint/blob.go index f0e4463131..b2e82f01d5 100644 --- a/internal/checkpoint/blob.go +++ b/internal/state/checkpoint/blob.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // BlobStore is a content-addressed store for checkpoint file payloads. diff --git a/internal/checkpoint/capture.go b/internal/state/checkpoint/capture.go similarity index 99% rename from internal/checkpoint/capture.go rename to internal/state/checkpoint/capture.go index 70849c5e39..85e0587efa 100644 --- a/internal/checkpoint/capture.go +++ b/internal/state/checkpoint/capture.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - fileenc "reasonix/internal/fileutil/encoding" + fileenc "reasonix/internal/base/fileutil/encoding" ) // Fingerprint is the identity of a path as observed on disk. diff --git a/internal/checkpoint/checkpoint.go b/internal/state/checkpoint/checkpoint.go similarity index 99% rename from internal/checkpoint/checkpoint.go rename to internal/state/checkpoint/checkpoint.go index 6c4ad8b0ef..54503f6d69 100644 --- a/internal/checkpoint/checkpoint.go +++ b/internal/state/checkpoint/checkpoint.go @@ -26,9 +26,9 @@ import ( "sync" "time" - "reasonix/internal/diff" - "reasonix/internal/fileutil" - fileenc "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/diff" + "reasonix/internal/base/fileutil" + fileenc "reasonix/internal/base/fileutil/encoding" ) // FileSnap is one file's state at the moment it was first touched in a turn. diff --git a/internal/checkpoint/checkpoint_test.go b/internal/state/checkpoint/checkpoint_test.go similarity index 99% rename from internal/checkpoint/checkpoint_test.go rename to internal/state/checkpoint/checkpoint_test.go index 9bc2e738e4..18590569ab 100644 --- a/internal/checkpoint/checkpoint_test.go +++ b/internal/state/checkpoint/checkpoint_test.go @@ -10,9 +10,9 @@ import ( "time" "unicode/utf8" - "reasonix/internal/diff" - fileenc "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + "reasonix/internal/base/diff" + fileenc "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func write(t *testing.T, p, s string) { diff --git a/internal/checkpoint/file_revert.go b/internal/state/checkpoint/file_revert.go similarity index 99% rename from internal/checkpoint/file_revert.go rename to internal/state/checkpoint/file_revert.go index f6196f8a4b..29d2fe8959 100644 --- a/internal/checkpoint/file_revert.go +++ b/internal/state/checkpoint/file_revert.go @@ -7,7 +7,7 @@ import ( "os" "time" - fileenc "reasonix/internal/fileutil/encoding" + fileenc "reasonix/internal/base/fileutil/encoding" ) // PrepareFileRevert prepares a single-file restore to the earliest session preimage. diff --git a/internal/checkpoint/nlink_unix.go b/internal/state/checkpoint/nlink_unix.go similarity index 100% rename from internal/checkpoint/nlink_unix.go rename to internal/state/checkpoint/nlink_unix.go diff --git a/internal/checkpoint/nlink_windows.go b/internal/state/checkpoint/nlink_windows.go similarity index 100% rename from internal/checkpoint/nlink_windows.go rename to internal/state/checkpoint/nlink_windows.go diff --git a/internal/checkpoint/observer.go b/internal/state/checkpoint/observer.go similarity index 99% rename from internal/checkpoint/observer.go rename to internal/state/checkpoint/observer.go index 36bc26c757..eac7ae346e 100644 --- a/internal/checkpoint/observer.go +++ b/internal/state/checkpoint/observer.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "reasonix/internal/diff" + "reasonix/internal/base/diff" ) // writerRegistry is shared across parent/child observers so background writer diff --git a/internal/checkpoint/secure_path_fallback.go b/internal/state/checkpoint/secure_path_fallback.go similarity index 100% rename from internal/checkpoint/secure_path_fallback.go rename to internal/state/checkpoint/secure_path_fallback.go diff --git a/internal/checkpoint/secure_path_unix.go b/internal/state/checkpoint/secure_path_unix.go similarity index 100% rename from internal/checkpoint/secure_path_unix.go rename to internal/state/checkpoint/secure_path_unix.go diff --git a/internal/checkpoint/transaction.go b/internal/state/checkpoint/transaction.go similarity index 99% rename from internal/checkpoint/transaction.go rename to internal/state/checkpoint/transaction.go index af64fe5b19..3a8c6a50dc 100644 --- a/internal/checkpoint/transaction.go +++ b/internal/state/checkpoint/transaction.go @@ -13,7 +13,7 @@ import ( "strings" "time" - fileenc "reasonix/internal/fileutil/encoding" + fileenc "reasonix/internal/base/fileutil/encoding" ) // InjectFail is a test seam. When set, CommitRewind fails at the named phase diff --git a/internal/checkpoint/transaction_test.go b/internal/state/checkpoint/transaction_test.go similarity index 99% rename from internal/checkpoint/transaction_test.go rename to internal/state/checkpoint/transaction_test.go index 7d3a8392ba..78d182003b 100644 --- a/internal/checkpoint/transaction_test.go +++ b/internal/state/checkpoint/transaction_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/diff" - "reasonix/internal/testenv" + "reasonix/internal/base/diff" + "reasonix/internal/base/testenv" ) type recordingConversationApplier struct { diff --git a/internal/checkpoint/types.go b/internal/state/checkpoint/types.go similarity index 99% rename from internal/checkpoint/types.go rename to internal/state/checkpoint/types.go index 05f010b62a..c319e54e07 100644 --- a/internal/checkpoint/types.go +++ b/internal/state/checkpoint/types.go @@ -3,7 +3,7 @@ package checkpoint import ( "time" - fileenc "reasonix/internal/fileutil/encoding" + fileenc "reasonix/internal/base/fileutil/encoding" ) // Schema versions for on-disk checkpoint JSON. diff --git a/internal/execgraph/doc.go b/internal/state/execgraph/doc.go similarity index 100% rename from internal/execgraph/doc.go rename to internal/state/execgraph/doc.go diff --git a/internal/execgraph/rebuild.go b/internal/state/execgraph/rebuild.go similarity index 98% rename from internal/execgraph/rebuild.go rename to internal/state/execgraph/rebuild.go index 102ee27e1e..dab9fc41ba 100644 --- a/internal/execgraph/rebuild.go +++ b/internal/state/execgraph/rebuild.go @@ -3,8 +3,8 @@ package execgraph import ( "time" - "reasonix/internal/agentgraph" - "reasonix/internal/execjournal" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/state/execjournal" ) // Child terminals, as the sub-agent store spells them. They are strings rather diff --git a/internal/execgraph/rebuild_test.go b/internal/state/execgraph/rebuild_test.go similarity index 99% rename from internal/execgraph/rebuild_test.go rename to internal/state/execgraph/rebuild_test.go index 992bc6844d..eac80a2aac 100644 --- a/internal/execgraph/rebuild_test.go +++ b/internal/state/execgraph/rebuild_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "reasonix/internal/agentgraph" - "reasonix/internal/execjournal" + "reasonix/internal/contract/agentgraph" + "reasonix/internal/state/execjournal" ) var base = time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC) diff --git a/internal/execjournal/doc.go b/internal/state/execjournal/doc.go similarity index 100% rename from internal/execjournal/doc.go rename to internal/state/execjournal/doc.go diff --git a/internal/execjournal/journal.go b/internal/state/execjournal/journal.go similarity index 99% rename from internal/execjournal/journal.go rename to internal/state/execjournal/journal.go index 6b4feb4aae..34fe2c9b9e 100644 --- a/internal/execjournal/journal.go +++ b/internal/state/execjournal/journal.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "reasonix/internal/store" + "reasonix/internal/state/store" ) // Statuses. Interrupted is absent on purpose: it is derived from an open entry diff --git a/internal/execjournal/journal_test.go b/internal/state/execjournal/journal_test.go similarity index 99% rename from internal/execjournal/journal_test.go rename to internal/state/execjournal/journal_test.go index 803e169f30..139138c770 100644 --- a/internal/execjournal/journal_test.go +++ b/internal/state/execjournal/journal_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/store" + "reasonix/internal/state/store" ) func sessionPath(t *testing.T) string { diff --git a/internal/history/indexed.go b/internal/state/history/indexed.go similarity index 98% rename from internal/history/indexed.go rename to internal/state/history/indexed.go index 817ae3b50e..5213aabcf7 100644 --- a/internal/history/indexed.go +++ b/internal/state/history/indexed.go @@ -7,10 +7,10 @@ import ( "strings" "sync" - "reasonix/internal/agent" - "reasonix/internal/historycatalog" - "reasonix/internal/provider" - "reasonix/internal/retrieval" + "reasonix/internal/base/retrieval" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/historycatalog" ) type indexedCatalogManager struct { diff --git a/internal/history/indexed_lifecycle_test.go b/internal/state/history/indexed_lifecycle_test.go similarity index 95% rename from internal/history/indexed_lifecycle_test.go rename to internal/state/history/indexed_lifecycle_test.go index 87b18538bc..71bfaa4dfc 100644 --- a/internal/history/indexed_lifecycle_test.go +++ b/internal/state/history/indexed_lifecycle_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "reasonix/internal/historycatalog" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/historycatalog" ) func TestIndexedCatalogManagerCloseFencesOpenAndAllowsRestart(t *testing.T) { diff --git a/internal/history/indexed_rebuild.go b/internal/state/history/indexed_rebuild.go similarity index 97% rename from internal/history/indexed_rebuild.go rename to internal/state/history/indexed_rebuild.go index 8b3aeb8346..8590587ba9 100644 --- a/internal/history/indexed_rebuild.go +++ b/internal/state/history/indexed_rebuild.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/historycatalog" + "reasonix/internal/state/historycatalog" ) func (m *indexedCatalogManager) rebuildShared(ctx context.Context, roots []historycatalog.Root) error { diff --git a/internal/history/indexed_rebuild_test.go b/internal/state/history/indexed_rebuild_test.go similarity index 95% rename from internal/history/indexed_rebuild_test.go rename to internal/state/history/indexed_rebuild_test.go index d38002d026..0e4bd18f73 100644 --- a/internal/history/indexed_rebuild_test.go +++ b/internal/state/history/indexed_rebuild_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "reasonix/internal/historycatalog" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/historycatalog" ) func TestIndexedCatalogManagerRebuildPreservesRootsAndRestarts(t *testing.T) { diff --git a/internal/history/lifecycle_close_test.go b/internal/state/history/lifecycle_close_test.go similarity index 93% rename from internal/history/lifecycle_close_test.go rename to internal/state/history/lifecycle_close_test.go index 2e638b1d3b..983c30619c 100644 --- a/internal/history/lifecycle_close_test.go +++ b/internal/state/history/lifecycle_close_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "reasonix/internal/historycatalog" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/state/historycatalog" ) // The process catalog outlives any one controller, so its close belongs at the diff --git a/internal/history/search.go b/internal/state/history/search.go similarity index 98% rename from internal/history/search.go rename to internal/state/history/search.go index 31dbb39ec4..d021d324c0 100644 --- a/internal/history/search.go +++ b/internal/state/history/search.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "reasonix/internal/agent" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/provider" - "reasonix/internal/retrieval" - "reasonix/internal/store" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/retrieval" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) // Kind identifies the part of a saved message indexed for retrieval. diff --git a/internal/history/search_test.go b/internal/state/history/search_test.go similarity index 98% rename from internal/history/search_test.go rename to internal/state/history/search_test.go index d4284f5479..260b177b67 100644 --- a/internal/history/search_test.go +++ b/internal/state/history/search_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func TestSearchRanksSavedSessionHistory(t *testing.T) { @@ -106,7 +106,7 @@ func TestSearchGlobalIncludesGlobalSessionDir(t *testing.T) { func TestSearchIndexesToolInputsAndErrors(t *testing.T) { sessionDir := testenv.TempDir(t) writeSession(t, filepath.Join(sessionDir, "tools.jsonl"), []provider.Message{ - {Role: provider.RoleAssistant, ToolCalls: []provider.ToolCall{{ID: "1", Name: "bash", Arguments: `{"cmd":"go test ./internal/history"}`}}}, + {Role: provider.RoleAssistant, ToolCalls: []provider.ToolCall{{ID: "1", Name: "bash", Arguments: `{"cmd":"go test ./internal/state/history"}`}}}, {Role: provider.RoleTool, ToolCallID: "1", Name: "bash", Content: "error: command exited: exit status 1\nFAIL"}, }) diff --git a/internal/history/strip.go b/internal/state/history/strip.go similarity index 95% rename from internal/history/strip.go rename to internal/state/history/strip.go index f2f92ef792..bb39f00fec 100644 --- a/internal/history/strip.go +++ b/internal/state/history/strip.go @@ -3,7 +3,7 @@ package history import ( "strings" - "reasonix/internal/agent" + "reasonix/internal/runtime/agent" ) const planModeMarkerPrefix = "[Plan mode" diff --git a/internal/history/tool.go b/internal/state/history/tool.go similarity index 98% rename from internal/history/tool.go rename to internal/state/history/tool.go index 0870fa96f8..4c8e227c96 100644 --- a/internal/history/tool.go +++ b/internal/state/history/tool.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "reasonix/internal/historycatalog" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/state/historycatalog" ) type historyTool struct { diff --git a/internal/history/tool_test.go b/internal/state/history/tool_test.go similarity index 98% rename from internal/history/tool_test.go rename to internal/state/history/tool_test.go index db21b31f30..04cb606684 100644 --- a/internal/history/tool_test.go +++ b/internal/state/history/tool_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func TestHistoryToolSearchAndAroundAreUsable(t *testing.T) { diff --git a/internal/historycatalog/benchmark_test.go b/internal/state/historycatalog/benchmark_test.go similarity index 100% rename from internal/historycatalog/benchmark_test.go rename to internal/state/historycatalog/benchmark_test.go diff --git a/internal/historycatalog/catalog.go b/internal/state/historycatalog/catalog.go similarity index 99% rename from internal/historycatalog/catalog.go rename to internal/state/historycatalog/catalog.go index eeb33e915a..a821b45d3a 100644 --- a/internal/historycatalog/catalog.go +++ b/internal/state/historycatalog/catalog.go @@ -16,10 +16,10 @@ import ( "sync/atomic" "time" - "reasonix/internal/agent" - "reasonix/internal/projectiondb" - "reasonix/internal/retrieval" - "reasonix/internal/store" + "reasonix/internal/base/retrieval" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/projectiondb" + "reasonix/internal/state/store" ) const defaultMissingGrace = 30 * time.Second diff --git a/internal/historycatalog/catalog_test.go b/internal/state/historycatalog/catalog_test.go similarity index 98% rename from internal/historycatalog/catalog_test.go rename to internal/state/historycatalog/catalog_test.go index 45bede7fe6..3b02dec8e8 100644 --- a/internal/historycatalog/catalog_test.go +++ b/internal/state/historycatalog/catalog_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func saveMessages(t *testing.T, path string, messages ...provider.Message) { diff --git a/internal/historycatalog/close_lifecycle_test.go b/internal/state/historycatalog/close_lifecycle_test.go similarity index 100% rename from internal/historycatalog/close_lifecycle_test.go rename to internal/state/historycatalog/close_lifecycle_test.go diff --git a/internal/historycatalog/documents.go b/internal/state/historycatalog/documents.go similarity index 95% rename from internal/historycatalog/documents.go rename to internal/state/historycatalog/documents.go index 4f314c4c2c..1c2e0e3f02 100644 --- a/internal/historycatalog/documents.go +++ b/internal/state/historycatalog/documents.go @@ -3,8 +3,8 @@ package historycatalog import ( "strings" - "reasonix/internal/provider" - "reasonix/internal/retrieval" + "reasonix/internal/base/retrieval" + "reasonix/internal/contract/provider" ) type indexedDocument struct { diff --git a/internal/historycatalog/incremental.go b/internal/state/historycatalog/incremental.go similarity index 97% rename from internal/historycatalog/incremental.go rename to internal/state/historycatalog/incremental.go index 4e87ed60ab..37812bb44e 100644 --- a/internal/historycatalog/incremental.go +++ b/internal/state/historycatalog/incremental.go @@ -3,8 +3,8 @@ package historycatalog import ( "context" - "reasonix/internal/agent" - "reasonix/internal/store" + "reasonix/internal/runtime/agent" + "reasonix/internal/state/store" ) func sourceProjectionUnchanged(queryErr error, oldContent, content, oldMeta, meta, oldDigest, digest string) bool { diff --git a/internal/historycatalog/rebuild.go b/internal/state/historycatalog/rebuild.go similarity index 97% rename from internal/historycatalog/rebuild.go rename to internal/state/historycatalog/rebuild.go index ed2bece77e..95833ed8a6 100644 --- a/internal/historycatalog/rebuild.go +++ b/internal/state/historycatalog/rebuild.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "reasonix/internal/projectiondb" + "reasonix/internal/state/projectiondb" ) // Rebuild replaces only the disposable FTS projection after indexing every diff --git a/internal/historycatalog/rebuild_test.go b/internal/state/historycatalog/rebuild_test.go similarity index 96% rename from internal/historycatalog/rebuild_test.go rename to internal/state/historycatalog/rebuild_test.go index e31075f7f0..6bf46b890b 100644 --- a/internal/historycatalog/rebuild_test.go +++ b/internal/state/historycatalog/rebuild_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) func TestReconcileRootDetectsMetaOnlyChange(t *testing.T) { diff --git a/internal/historycatalog/rebuild_tokenizer_test.go b/internal/state/historycatalog/rebuild_tokenizer_test.go similarity index 95% rename from internal/historycatalog/rebuild_tokenizer_test.go rename to internal/state/historycatalog/rebuild_tokenizer_test.go index 851472f663..3bb3698e5e 100644 --- a/internal/historycatalog/rebuild_tokenizer_test.go +++ b/internal/state/historycatalog/rebuild_tokenizer_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" ) // A rebuild must survive being opened: it indexed with this build's tokenizer, diff --git a/internal/historycatalog/schema.go b/internal/state/historycatalog/schema.go similarity index 98% rename from internal/historycatalog/schema.go rename to internal/state/historycatalog/schema.go index 0b8b754011..fc93dca448 100644 --- a/internal/historycatalog/schema.go +++ b/internal/state/historycatalog/schema.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" - "reasonix/internal/projectiondb" + "reasonix/internal/state/projectiondb" ) const migrationV1 = ` diff --git a/internal/historycatalog/types.go b/internal/state/historycatalog/types.go similarity index 97% rename from internal/historycatalog/types.go rename to internal/state/historycatalog/types.go index be596c6316..686552c64b 100644 --- a/internal/historycatalog/types.go +++ b/internal/state/historycatalog/types.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/projectiondb" + "reasonix/internal/contract/config" + "reasonix/internal/state/projectiondb" ) const ( diff --git a/internal/instruction/instruction.go b/internal/state/instruction/instruction.go similarity index 100% rename from internal/instruction/instruction.go rename to internal/state/instruction/instruction.go diff --git a/internal/instruction/instruction_test.go b/internal/state/instruction/instruction_test.go similarity index 100% rename from internal/instruction/instruction_test.go rename to internal/state/instruction/instruction_test.go diff --git a/internal/instruction/render.go b/internal/state/instruction/render.go similarity index 100% rename from internal/instruction/render.go rename to internal/state/instruction/render.go diff --git a/internal/instruction/resolver.go b/internal/state/instruction/resolver.go similarity index 99% rename from internal/instruction/resolver.go rename to internal/state/instruction/resolver.go index 956b69acb7..f606d3f6e8 100644 --- a/internal/instruction/resolver.go +++ b/internal/state/instruction/resolver.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) type Scope string diff --git a/internal/instruction/resolver_test.go b/internal/state/instruction/resolver_test.go similarity index 99% rename from internal/instruction/resolver_test.go rename to internal/state/instruction/resolver_test.go index c5d16d2fab..9a93cc639e 100644 --- a/internal/instruction/resolver_test.go +++ b/internal/state/instruction/resolver_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestResolveKeepsMostSpecificSourceForExactDuplicate(t *testing.T) { diff --git a/internal/memory/activation.go b/internal/state/memory/activation.go similarity index 100% rename from internal/memory/activation.go rename to internal/state/memory/activation.go diff --git a/internal/memory/activation_test.go b/internal/state/memory/activation_test.go similarity index 100% rename from internal/memory/activation_test.go rename to internal/state/memory/activation_test.go diff --git a/internal/memory/auto_recall.go b/internal/state/memory/auto_recall.go similarity index 99% rename from internal/memory/auto_recall.go rename to internal/state/memory/auto_recall.go index 1de043f243..dbe3e47140 100644 --- a/internal/memory/auto_recall.go +++ b/internal/state/memory/auto_recall.go @@ -10,7 +10,7 @@ import ( "unicode" "unicode/utf8" - "reasonix/internal/retrieval" + "reasonix/internal/base/retrieval" ) // Automatic recall's defaults. They are starting points, not ceilings: a user diff --git a/internal/memory/auto_recall_test.go b/internal/state/memory/auto_recall_test.go similarity index 99% rename from internal/memory/auto_recall_test.go rename to internal/state/memory/auto_recall_test.go index c9bfbfb9bd..2abbe88abd 100644 --- a/internal/memory/auto_recall_test.go +++ b/internal/state/memory/auto_recall_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestAutoRecallRejectsGenericAndWeakMatches(t *testing.T) { diff --git a/internal/memory/bounded_name_test.go b/internal/state/memory/bounded_name_test.go similarity index 97% rename from internal/memory/bounded_name_test.go rename to internal/state/memory/bounded_name_test.go index a0d693100d..9e1ccb7e88 100644 --- a/internal/memory/bounded_name_test.go +++ b/internal/state/memory/bounded_name_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestSaveBoundsLongNames: a memory name distilled from a long diff --git a/internal/memory/convention_test.go b/internal/state/memory/convention_test.go similarity index 98% rename from internal/memory/convention_test.go rename to internal/state/memory/convention_test.go index c3e83d8fb5..23c06bb80f 100644 --- a/internal/memory/convention_test.go +++ b/internal/state/memory/convention_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestClaudeMdDiscovered(t *testing.T) { diff --git a/internal/memory/doc.go b/internal/state/memory/doc.go similarity index 95% rename from internal/memory/doc.go rename to internal/state/memory/doc.go index 9c1606eb0d..65d35b204f 100644 --- a/internal/memory/doc.go +++ b/internal/state/memory/doc.go @@ -1,7 +1,7 @@ // Package memory implements Reasonix's persistent memory. It mirrors Claude // Code's two-layer model while honoring Reasonix's cache-first architecture: // -// - Standing instructions resolved by internal/instruction and exposed here +// - Standing instructions resolved by internal/state/instruction and exposed here // through compatibility aliases for existing panel and controller APIs. // - Auto-memory store: per-project fact files with frontmatter plus a MEMORY.md // index, which the model maintains via the `remember` tool (see store.go). @@ -16,7 +16,7 @@ package memory import ( "path/filepath" - "reasonix/internal/instruction" + "reasonix/internal/state/instruction" ) // Scope labels where a doc source was discovered, so the assembled block can diff --git a/internal/memory/forget.go b/internal/state/memory/forget.go similarity index 98% rename from internal/memory/forget.go rename to internal/state/memory/forget.go index bd7111a92b..f7bfe64a7f 100644 --- a/internal/memory/forget.go +++ b/internal/state/memory/forget.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // forgetTool deletes a saved memory the model judges wrong or stale. Like diff --git a/internal/memory/forget_test.go b/internal/state/memory/forget_test.go similarity index 99% rename from internal/memory/forget_test.go rename to internal/state/memory/forget_test.go index d423860c0c..0b40b1d558 100644 --- a/internal/memory/forget_test.go +++ b/internal/state/memory/forget_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestForgetToolDeletes drives the tool with raw JSON args and verifies the fact diff --git a/internal/memory/freshness.go b/internal/state/memory/freshness.go similarity index 100% rename from internal/memory/freshness.go rename to internal/state/memory/freshness.go diff --git a/internal/memory/freshness_test.go b/internal/state/memory/freshness_test.go similarity index 100% rename from internal/memory/freshness_test.go rename to internal/state/memory/freshness_test.go diff --git a/internal/memory/index.go b/internal/state/memory/index.go similarity index 100% rename from internal/memory/index.go rename to internal/state/memory/index.go diff --git a/internal/memory/index_scope_test.go b/internal/state/memory/index_scope_test.go similarity index 100% rename from internal/memory/index_scope_test.go rename to internal/state/memory/index_scope_test.go diff --git a/internal/memory/keywords_recall_test.go b/internal/state/memory/keywords_recall_test.go similarity index 100% rename from internal/memory/keywords_recall_test.go rename to internal/state/memory/keywords_recall_test.go diff --git a/internal/memory/memory.go b/internal/state/memory/memory.go similarity index 99% rename from internal/memory/memory.go rename to internal/state/memory/memory.go index 0412c28b2d..7d60bbd361 100644 --- a/internal/memory/memory.go +++ b/internal/state/memory/memory.go @@ -7,7 +7,7 @@ import ( "strings" "unicode/utf8" - "reasonix/internal/instruction" + "reasonix/internal/state/instruction" ) // Set is everything memory loaded for one session: the hierarchical docs and a diff --git a/internal/memory/memory_test.go b/internal/state/memory/memory_test.go similarity index 99% rename from internal/memory/memory_test.go rename to internal/state/memory/memory_test.go index 88f193e1d0..61a37869e4 100644 --- a/internal/memory/memory_test.go +++ b/internal/state/memory/memory_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) // TestComposeEmptyIsIdentity is the cache-first invariant: with no memory at diff --git a/internal/memory/prefix_cost_test.go b/internal/state/memory/prefix_cost_test.go similarity index 99% rename from internal/memory/prefix_cost_test.go rename to internal/state/memory/prefix_cost_test.go index cec5da0a25..14d59a3ca0 100644 --- a/internal/memory/prefix_cost_test.go +++ b/internal/state/memory/prefix_cost_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // An expired fact is already refused by automatic recall. Leaving its line in diff --git a/internal/memory/queue.go b/internal/state/memory/queue.go similarity index 100% rename from internal/memory/queue.go rename to internal/state/memory/queue.go diff --git a/internal/memory/queue_context_test.go b/internal/state/memory/queue_context_test.go similarity index 100% rename from internal/memory/queue_context_test.go rename to internal/state/memory/queue_context_test.go diff --git a/internal/memory/quickadd.go b/internal/state/memory/quickadd.go similarity index 97% rename from internal/memory/quickadd.go rename to internal/state/memory/quickadd.go index 6ac3e6a1c7..a28c0ffd79 100644 --- a/internal/memory/quickadd.go +++ b/internal/state/memory/quickadd.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" ) // quickAddHeading marks the section quick-added notes accumulate under, so diff --git a/internal/memory/quickadd_test.go b/internal/state/memory/quickadd_test.go similarity index 98% rename from internal/memory/quickadd_test.go rename to internal/state/memory/quickadd_test.go index bfdd700d95..a38e191ca3 100644 --- a/internal/memory/quickadd_test.go +++ b/internal/state/memory/quickadd_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestAppendDocCreatesAndAppends verifies the "#" quick-add path: a fresh file diff --git a/internal/memory/recall.go b/internal/state/memory/recall.go similarity index 99% rename from internal/memory/recall.go rename to internal/state/memory/recall.go index 15513105aa..8f95d99e75 100644 --- a/internal/memory/recall.go +++ b/internal/state/memory/recall.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "reasonix/internal/retrieval" - "reasonix/internal/tool" + "reasonix/internal/base/retrieval" + "reasonix/internal/contract/tool" ) const ( diff --git a/internal/memory/recall_index.go b/internal/state/memory/recall_index.go similarity index 98% rename from internal/memory/recall_index.go rename to internal/state/memory/recall_index.go index d6cddc3fdf..7296830042 100644 --- a/internal/memory/recall_index.go +++ b/internal/state/memory/recall_index.go @@ -7,7 +7,7 @@ package memory import ( "strings" - "reasonix/internal/retrieval" + "reasonix/internal/base/retrieval" ) // RecallIndex is the prebuilt retrieval state for one immutable Set snapshot. diff --git a/internal/memory/recall_index_test.go b/internal/state/memory/recall_index_test.go similarity index 98% rename from internal/memory/recall_index_test.go rename to internal/state/memory/recall_index_test.go index c39eb11e6a..1e5c32b734 100644 --- a/internal/memory/recall_index_test.go +++ b/internal/state/memory/recall_index_test.go @@ -3,7 +3,7 @@ package memory import ( "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // The index and the direct store scan must be indistinguishable: same hits, diff --git a/internal/memory/recall_test.go b/internal/state/memory/recall_test.go similarity index 99% rename from internal/memory/recall_test.go rename to internal/state/memory/recall_test.go index f6bd2046d1..230415d8fa 100644 --- a/internal/memory/recall_test.go +++ b/internal/state/memory/recall_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestRecallToolSearchesSavedMemories(t *testing.T) { diff --git a/internal/memory/remember.go b/internal/state/memory/remember.go similarity index 99% rename from internal/memory/remember.go rename to internal/state/memory/remember.go index 09c1f58060..8a2b94bb40 100644 --- a/internal/memory/remember.go +++ b/internal/state/memory/remember.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // rememberTool lets the model persist a durable fact to the auto-memory store. diff --git a/internal/memory/remember_policy.go b/internal/state/memory/remember_policy.go similarity index 99% rename from internal/memory/remember_policy.go rename to internal/state/memory/remember_policy.go index 137f53ed99..9896abb59f 100644 --- a/internal/memory/remember_policy.go +++ b/internal/state/memory/remember_policy.go @@ -6,7 +6,7 @@ import ( "strings" "unicode" - "reasonix/internal/secrets" + "reasonix/internal/base/secrets" ) const maxAutoRememberBodyRunes = 6000 diff --git a/internal/memory/remember_policy_test.go b/internal/state/memory/remember_policy_test.go similarity index 99% rename from internal/memory/remember_policy_test.go rename to internal/state/memory/remember_policy_test.go index 5bf5c54fcf..132361c6ca 100644 --- a/internal/memory/remember_policy_test.go +++ b/internal/state/memory/remember_policy_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestAssessRememberWriteAutoAllowsOnlyLowRiskProjectCreates(t *testing.T) { diff --git a/internal/memory/remember_test.go b/internal/state/memory/remember_test.go similarity index 99% rename from internal/memory/remember_test.go rename to internal/state/memory/remember_test.go index f6f66f28e3..d6824b849c 100644 --- a/internal/memory/remember_test.go +++ b/internal/state/memory/remember_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestRememberToolSaves drives the tool the way the agent does — raw JSON args — diff --git a/internal/memory/render.go b/internal/state/memory/render.go similarity index 100% rename from internal/memory/render.go rename to internal/state/memory/render.go diff --git a/internal/memory/shadow_recall_test.go b/internal/state/memory/shadow_recall_test.go similarity index 100% rename from internal/memory/shadow_recall_test.go rename to internal/state/memory/shadow_recall_test.go diff --git a/internal/memory/store.go b/internal/state/memory/store.go similarity index 99% rename from internal/memory/store.go rename to internal/state/memory/store.go index 88ad698d59..3f571ec25b 100644 --- a/internal/memory/store.go +++ b/internal/state/memory/store.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/frontmatter" + "reasonix/internal/base/fileutil" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/frontmatter" + "reasonix/internal/contract/config" ) // Store is the scoped auto-memory store: project and global directories of @@ -790,7 +790,7 @@ func (s Store) scopeForPath(path string) FactScope { } // splitFrontmatter is a thin wrapper; the real parser lives in -// internal/frontmatter. +// internal/base/frontmatter. func splitFrontmatter(s string) (map[string]string, string) { return frontmatter.SplitLegacy(s) } diff --git a/internal/memory/store_extra_test.go b/internal/state/memory/store_extra_test.go similarity index 99% rename from internal/memory/store_extra_test.go rename to internal/state/memory/store_extra_test.go index e60eb9af78..5066d23b52 100644 --- a/internal/memory/store_extra_test.go +++ b/internal/state/memory/store_extra_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // splitFrontmatter diff --git a/internal/memory/store_test.go b/internal/state/memory/store_test.go similarity index 99% rename from internal/memory/store_test.go rename to internal/state/memory/store_test.go index 0a968a3a9e..04a74fc23e 100644 --- a/internal/memory/store_test.go +++ b/internal/state/memory/store_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) // TestRenderEscapesYAMLMetacharacters pins the frontmatter-corruption fix: a diff --git a/internal/memory/store_v2.go b/internal/state/memory/store_v2.go similarity index 99% rename from internal/memory/store_v2.go rename to internal/state/memory/store_v2.go index a659140a3d..41cbf69ebb 100644 --- a/internal/memory/store_v2.go +++ b/internal/state/memory/store_v2.go @@ -15,7 +15,7 @@ import ( "time" "unicode/utf8" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) type SaveOptions struct { diff --git a/internal/memory/store_v2_test.go b/internal/state/memory/store_v2_test.go similarity index 99% rename from internal/memory/store_v2_test.go rename to internal/state/memory/store_v2_test.go index f45f74e25f..6a44470724 100644 --- a/internal/memory/store_v2_test.go +++ b/internal/state/memory/store_v2_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestStoreV2StableIDSurvivesRenameAndRevisionIncrements(t *testing.T) { diff --git a/internal/memory/subject.go b/internal/state/memory/subject.go similarity index 100% rename from internal/memory/subject.go rename to internal/state/memory/subject.go diff --git a/internal/memory/subject_test.go b/internal/state/memory/subject_test.go similarity index 100% rename from internal/memory/subject_test.go rename to internal/state/memory/subject_test.go diff --git a/internal/memory/writedoc_test.go b/internal/state/memory/writedoc_test.go similarity index 98% rename from internal/memory/writedoc_test.go rename to internal/state/memory/writedoc_test.go index 67afb5f5a1..95536d66b3 100644 --- a/internal/memory/writedoc_test.go +++ b/internal/state/memory/writedoc_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestWriteDocAllowsRecognizedFiles verifies WriteDoc overwrites a canonical diff --git a/internal/migration/migration.go b/internal/state/migration/migration.go similarity index 99% rename from internal/migration/migration.go rename to internal/state/migration/migration.go index 05f96944ce..c35365281f 100644 --- a/internal/migration/migration.go +++ b/internal/state/migration/migration.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/config" - "reasonix/internal/event" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/agent" ) // SessionImport records one legacy session source that contributed sessions. diff --git a/internal/migration/migration_test.go b/internal/state/migration/migration_test.go similarity index 99% rename from internal/migration/migration_test.go rename to internal/state/migration/migration_test.go index 486ac67a3a..230ed36c38 100644 --- a/internal/migration/migration_test.go +++ b/internal/state/migration/migration_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" ) const legacyMessageLog = `{"role":"user","content":"hello from v0.x"} diff --git a/internal/migration/relocated_state.go b/internal/state/migration/relocated_state.go similarity index 96% rename from internal/migration/relocated_state.go rename to internal/state/migration/relocated_state.go index 252ee7ac24..fcce46838a 100644 --- a/internal/migration/relocated_state.go +++ b/internal/state/migration/relocated_state.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "reasonix/internal/config" - "reasonix/internal/event" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" ) // AdoptRelocatedStateEntries brings across what an earlier relocation left in diff --git a/internal/migration/relocated_state_test.go b/internal/state/migration/relocated_state_test.go similarity index 97% rename from internal/migration/relocated_state_test.go rename to internal/state/migration/relocated_state_test.go index 298c9adbcd..ff6edbdbb6 100644 --- a/internal/migration/relocated_state_test.go +++ b/internal/state/migration/relocated_state_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" ) func seed(t *testing.T, dir, name, file string) { diff --git a/internal/projectiondb/projectiondb.go b/internal/state/projectiondb/projectiondb.go similarity index 99% rename from internal/projectiondb/projectiondb.go rename to internal/state/projectiondb/projectiondb.go index 333133cd74..d9b13e1856 100644 --- a/internal/projectiondb/projectiondb.go +++ b/internal/state/projectiondb/projectiondb.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "reasonix/internal/filelock" + "reasonix/internal/base/filelock" moderncsqlite "modernc.org/sqlite" sqlite3 "modernc.org/sqlite/lib" diff --git a/internal/projectiondb/projectiondb_test.go b/internal/state/projectiondb/projectiondb_test.go similarity index 99% rename from internal/projectiondb/projectiondb_test.go rename to internal/state/projectiondb/projectiondb_test.go index 5559802f94..d1681efc08 100644 --- a/internal/projectiondb/projectiondb_test.go +++ b/internal/state/projectiondb/projectiondb_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "reasonix/internal/filelock" - "reasonix/internal/testenv" + "reasonix/internal/base/filelock" + "reasonix/internal/base/testenv" ) func testMigrations() []Migration { diff --git a/internal/projectiondb/remote_fs_darwin.go b/internal/state/projectiondb/remote_fs_darwin.go similarity index 100% rename from internal/projectiondb/remote_fs_darwin.go rename to internal/state/projectiondb/remote_fs_darwin.go diff --git a/internal/projectiondb/remote_fs_linux.go b/internal/state/projectiondb/remote_fs_linux.go similarity index 100% rename from internal/projectiondb/remote_fs_linux.go rename to internal/state/projectiondb/remote_fs_linux.go diff --git a/internal/projectiondb/remote_fs_other.go b/internal/state/projectiondb/remote_fs_other.go similarity index 100% rename from internal/projectiondb/remote_fs_other.go rename to internal/state/projectiondb/remote_fs_other.go diff --git a/internal/projectiondb/remote_fs_windows.go b/internal/state/projectiondb/remote_fs_windows.go similarity index 100% rename from internal/projectiondb/remote_fs_windows.go rename to internal/state/projectiondb/remote_fs_windows.go diff --git a/internal/sessioninbox/admission_benchmark_test.go b/internal/state/sessioninbox/admission_benchmark_test.go similarity index 98% rename from internal/sessioninbox/admission_benchmark_test.go rename to internal/state/sessioninbox/admission_benchmark_test.go index 7909538577..be2a8bbbd7 100644 --- a/internal/sessioninbox/admission_benchmark_test.go +++ b/internal/state/sessioninbox/admission_benchmark_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestAdmittedItemsRejectUserCRUD(t *testing.T) { diff --git a/internal/sessioninbox/disk.go b/internal/state/sessioninbox/disk.go similarity index 99% rename from internal/sessioninbox/disk.go rename to internal/state/sessioninbox/disk.go index 1528627943..8a55c10128 100644 --- a/internal/sessioninbox/disk.go +++ b/internal/state/sessioninbox/disk.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "reasonix/internal/fileutil" - "reasonix/internal/store" + "reasonix/internal/base/fileutil" + "reasonix/internal/state/store" ) func (s *Store) mutableLocked() error { diff --git a/internal/sessioninbox/doc.go b/internal/state/sessioninbox/doc.go similarity index 100% rename from internal/sessioninbox/doc.go rename to internal/state/sessioninbox/doc.go diff --git a/internal/sessioninbox/idempotency_store.go b/internal/state/sessioninbox/idempotency_store.go similarity index 100% rename from internal/sessioninbox/idempotency_store.go rename to internal/state/sessioninbox/idempotency_store.go diff --git a/internal/sessioninbox/ids.go b/internal/state/sessioninbox/ids.go similarity index 100% rename from internal/sessioninbox/ids.go rename to internal/state/sessioninbox/ids.go diff --git a/internal/sessioninbox/manifest.go b/internal/state/sessioninbox/manifest.go similarity index 100% rename from internal/sessioninbox/manifest.go rename to internal/state/sessioninbox/manifest.go diff --git a/internal/sessioninbox/metrics.go b/internal/state/sessioninbox/metrics.go similarity index 100% rename from internal/sessioninbox/metrics.go rename to internal/state/sessioninbox/metrics.go diff --git a/internal/sessioninbox/ops.go b/internal/state/sessioninbox/ops.go similarity index 100% rename from internal/sessioninbox/ops.go rename to internal/state/sessioninbox/ops.go diff --git a/internal/sessioninbox/recovery.go b/internal/state/sessioninbox/recovery.go similarity index 100% rename from internal/sessioninbox/recovery.go rename to internal/state/sessioninbox/recovery.go diff --git a/internal/sessioninbox/recovery_test.go b/internal/state/sessioninbox/recovery_test.go similarity index 98% rename from internal/sessioninbox/recovery_test.go rename to internal/state/sessioninbox/recovery_test.go index 09f954b6de..fe3fc7ad06 100644 --- a/internal/sessioninbox/recovery_test.go +++ b/internal/state/sessioninbox/recovery_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestRecoverOrphanedInFlightPreservesOwnedAndPendingItems(t *testing.T) { diff --git a/internal/sessioninbox/refs.go b/internal/state/sessioninbox/refs.go similarity index 100% rename from internal/sessioninbox/refs.go rename to internal/state/sessioninbox/refs.go diff --git a/internal/sessioninbox/store.go b/internal/state/sessioninbox/store.go similarity index 99% rename from internal/sessioninbox/store.go rename to internal/state/sessioninbox/store.go index c7aecc113a..7b47c2ac2e 100644 --- a/internal/sessioninbox/store.go +++ b/internal/state/sessioninbox/store.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "reasonix/internal/filelock" - "reasonix/internal/store" + "reasonix/internal/base/filelock" + "reasonix/internal/state/store" ) const ( diff --git a/internal/sessioninbox/store_test.go b/internal/state/sessioninbox/store_test.go similarity index 99% rename from internal/sessioninbox/store_test.go rename to internal/state/sessioninbox/store_test.go index a730989614..e7a9b8efc0 100644 --- a/internal/sessioninbox/store_test.go +++ b/internal/state/sessioninbox/store_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "reasonix/internal/fileutil" - "reasonix/internal/store" - "reasonix/internal/testenv" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/testenv" + "reasonix/internal/state/store" ) func TestEnqueueSnapshotAndRead(t *testing.T) { diff --git a/internal/sessioninbox/types.go b/internal/state/sessioninbox/types.go similarity index 100% rename from internal/sessioninbox/types.go rename to internal/state/sessioninbox/types.go diff --git a/internal/sessiontemp/context.go b/internal/state/sessiontemp/context.go similarity index 100% rename from internal/sessiontemp/context.go rename to internal/state/sessiontemp/context.go diff --git a/internal/sessiontemp/context_deadline.go b/internal/state/sessiontemp/context_deadline.go similarity index 100% rename from internal/sessiontemp/context_deadline.go rename to internal/state/sessiontemp/context_deadline.go diff --git a/internal/sessiontemp/manager.go b/internal/state/sessiontemp/manager.go similarity index 99% rename from internal/sessiontemp/manager.go rename to internal/state/sessiontemp/manager.go index 0b12194c79..ecf393102e 100644 --- a/internal/sessiontemp/manager.go +++ b/internal/state/sessiontemp/manager.go @@ -21,7 +21,7 @@ import ( "sync/atomic" "time" - "reasonix/internal/filelock" + "reasonix/internal/base/filelock" ) const ( diff --git a/internal/sessiontemp/manager_test.go b/internal/state/sessiontemp/manager_test.go similarity index 99% rename from internal/sessiontemp/manager_test.go rename to internal/state/sessiontemp/manager_test.go index 630beeebe3..c6f91d58f1 100644 --- a/internal/sessiontemp/manager_test.go +++ b/internal/state/sessiontemp/manager_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestAcquireSharesGeneration(t *testing.T) { diff --git a/internal/sessiontemp/manager_test_helpers.go b/internal/state/sessiontemp/manager_test_helpers.go similarity index 74% rename from internal/sessiontemp/manager_test_helpers.go rename to internal/state/sessiontemp/manager_test_helpers.go index 0f8d61e353..89b4225823 100644 --- a/internal/sessiontemp/manager_test_helpers.go +++ b/internal/state/sessiontemp/manager_test_helpers.go @@ -1,6 +1,6 @@ package sessiontemp -import "reasonix/internal/filelock" +import "reasonix/internal/base/filelock" func tryLockForTest(path string) (func(), error) { return filelock.Acquire(nilContext(), path) diff --git a/internal/stats/cost_test.go b/internal/state/stats/cost_test.go similarity index 99% rename from internal/stats/cost_test.go rename to internal/state/stats/cost_test.go index 953442bfb1..cfcdf72725 100644 --- a/internal/stats/cost_test.go +++ b/internal/state/stats/cost_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // writeDay drops raw JSONL lines into a day file the way the recorder would. diff --git a/internal/stats/query.go b/internal/state/stats/query.go similarity index 99% rename from internal/stats/query.go rename to internal/state/stats/query.go index 89cfb645ef..791231cf84 100644 --- a/internal/stats/query.go +++ b/internal/state/stats/query.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "reasonix/internal/billing" - "reasonix/internal/usagecatalog" + "reasonix/internal/model/billing" + "reasonix/internal/state/usagecatalog" ) // DailyTokens is one day's token usage and turn count in a trend series. diff --git a/internal/stats/record.go b/internal/state/stats/record.go similarity index 99% rename from internal/stats/record.go rename to internal/state/stats/record.go index d56e969d3b..ed65b391c5 100644 --- a/internal/stats/record.go +++ b/internal/state/stats/record.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "reasonix/internal/filelock" - "reasonix/internal/usagecatalog" + "reasonix/internal/base/filelock" + "reasonix/internal/state/usagecatalog" ) // dayLayout names one stats file per UTC-free local day, e.g. 2026-08-02.jsonl. diff --git a/internal/stats/recorder.go b/internal/state/stats/recorder.go similarity index 98% rename from internal/stats/recorder.go rename to internal/state/stats/recorder.go index 53efd7996f..7afad65153 100644 --- a/internal/stats/recorder.go +++ b/internal/state/stats/recorder.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "reasonix/internal/billing" - "reasonix/internal/event" - "reasonix/internal/provider" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" + "reasonix/internal/model/billing" ) // Recorder is a passthrough event.Sink that snapshots token usage (event.Usage) diff --git a/internal/stats/stats_test.go b/internal/state/stats/stats_test.go similarity index 99% rename from internal/stats/stats_test.go rename to internal/state/stats/stats_test.go index a46dc25f36..4b3f43b865 100644 --- a/internal/stats/stats_test.go +++ b/internal/state/stats/stats_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/filelock" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/filelock" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/provider" ) func flushRecorder(t *testing.T, recorder *Recorder) { diff --git a/internal/stats/usage_catalog.go b/internal/state/stats/usage_catalog.go similarity index 98% rename from internal/stats/usage_catalog.go rename to internal/state/stats/usage_catalog.go index 1f25b4462b..286509a83f 100644 --- a/internal/stats/usage_catalog.go +++ b/internal/state/stats/usage_catalog.go @@ -7,8 +7,8 @@ import ( "sync" "sync/atomic" - "reasonix/internal/config" - "reasonix/internal/usagecatalog" + "reasonix/internal/contract/config" + "reasonix/internal/state/usagecatalog" ) type usageManager struct { diff --git a/internal/stats/usage_catalog_lifecycle_test.go b/internal/state/stats/usage_catalog_lifecycle_test.go similarity index 95% rename from internal/stats/usage_catalog_lifecycle_test.go rename to internal/state/stats/usage_catalog_lifecycle_test.go index ef96e6fc1e..b3071748b5 100644 --- a/internal/stats/usage_catalog_lifecycle_test.go +++ b/internal/state/stats/usage_catalog_lifecycle_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "reasonix/internal/testenv" - "reasonix/internal/usagecatalog" + "reasonix/internal/base/testenv" + "reasonix/internal/state/usagecatalog" ) func TestUsageManagerCloseFencesOpenAndAllowsRestart(t *testing.T) { diff --git a/internal/storage/adopt_test.go b/internal/state/storage/adopt_test.go similarity index 99% rename from internal/storage/adopt_test.go rename to internal/state/storage/adopt_test.go index c96d81d33f..c59ac5e0f0 100644 --- a/internal/storage/adopt_test.go +++ b/internal/state/storage/adopt_test.go @@ -6,8 +6,8 @@ import ( "slices" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) // The report this exists for: a Studio whose configuration came back without diff --git a/internal/storage/marker.go b/internal/state/storage/marker.go similarity index 99% rename from internal/storage/marker.go rename to internal/state/storage/marker.go index 345a6b2bad..404ec99b7d 100644 --- a/internal/storage/marker.go +++ b/internal/state/storage/marker.go @@ -8,7 +8,7 @@ import ( "slices" "time" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // markerName is written at the top of a relocated root, never inside it. diff --git a/internal/storage/move.go b/internal/state/storage/move.go similarity index 99% rename from internal/storage/move.go rename to internal/state/storage/move.go index e568010936..c2fe70080e 100644 --- a/internal/storage/move.go +++ b/internal/state/storage/move.go @@ -14,8 +14,8 @@ import ( "path/filepath" "time" - "reasonix/internal/config" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" + "reasonix/internal/contract/config" ) // Phase is where a move got to. The order is the guarantee: everything before diff --git a/internal/storage/move_test.go b/internal/state/storage/move_test.go similarity index 99% rename from internal/storage/move_test.go rename to internal/state/storage/move_test.go index 1f4f79b931..286aefc1d0 100644 --- a/internal/storage/move_test.go +++ b/internal/state/storage/move_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func stateHome(t *testing.T) string { diff --git a/internal/storage/preflight.go b/internal/state/storage/preflight.go similarity index 98% rename from internal/storage/preflight.go rename to internal/state/storage/preflight.go index ef87f2e8ea..0325e6d01e 100644 --- a/internal/storage/preflight.go +++ b/internal/state/storage/preflight.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" - "reasonix/internal/textutil" + "reasonix/internal/base/textutil" + "reasonix/internal/contract/config" ) // Refusal is one reason a move cannot proceed. Code is stable for the caller to diff --git a/internal/storage/survey.go b/internal/state/storage/survey.go similarity index 98% rename from internal/storage/survey.go rename to internal/state/storage/survey.go index c36ba2d4da..8a02c78b42 100644 --- a/internal/storage/survey.go +++ b/internal/state/storage/survey.go @@ -1,6 +1,6 @@ // Package storage measures what the runtime keeps on disk: how much each // declared root holds, and what the volume under it has left. It reads the root -// table rather than a list of its own, so a root declared in internal/config is +// table rather than a list of its own, so a root declared in internal/contract/config is // accounted for here without this package being told about it. package storage @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/config" + "reasonix/internal/contract/config" ) // Root is one root as measured: where it resolved to, whether a user may move diff --git a/internal/storage/survey_test.go b/internal/state/storage/survey_test.go similarity index 98% rename from internal/storage/survey_test.go rename to internal/state/storage/survey_test.go index 2d0257cdb6..6b80fa59e0 100644 --- a/internal/storage/survey_test.go +++ b/internal/state/storage/survey_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "reasonix/internal/config" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" ) func write(t *testing.T, path string, size int) { diff --git a/internal/storage/volume_unix.go b/internal/state/storage/volume_unix.go similarity index 100% rename from internal/storage/volume_unix.go rename to internal/state/storage/volume_unix.go diff --git a/internal/storage/volume_windows.go b/internal/state/storage/volume_windows.go similarity index 100% rename from internal/storage/volume_windows.go rename to internal/state/storage/volume_windows.go diff --git a/internal/store/remote.go b/internal/state/store/remote.go similarity index 96% rename from internal/store/remote.go rename to internal/state/store/remote.go index 32b9987cde..3eeac26797 100644 --- a/internal/store/remote.go +++ b/internal/state/store/remote.go @@ -11,8 +11,8 @@ import ( // bootstrapped remote serve leaves under the remote host's // ~/.reasonix/remote/. Only name derivation lives here (this package is the // path authority and does no I/O); reads and writes happen over SFTP in -// internal/remote. Local-side absolute paths (managed known_hosts) are -// derived in internal/config/paths.go, which owns REASONIX_HOME resolution. +// internal/platform/remote. Local-side absolute paths (managed known_hosts) are +// derived in internal/contract/config/paths.go, which owns REASONIX_HOME resolution. // RemoteDirName is the directory under the remote ~/.reasonix that holds all // remote-module state, and under the local Reasonix home that holds the diff --git a/internal/store/remote_test.go b/internal/state/store/remote_test.go similarity index 100% rename from internal/store/remote_test.go rename to internal/state/store/remote_test.go diff --git a/internal/store/remove_artifacts_test.go b/internal/state/store/remove_artifacts_test.go similarity index 98% rename from internal/store/remove_artifacts_test.go rename to internal/state/store/remove_artifacts_test.go index 4d1ad6d967..3448dbea11 100644 --- a/internal/store/remove_artifacts_test.go +++ b/internal/state/store/remove_artifacts_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // The directory sidecar is the one every hand-rolled deleter dropped: a list of diff --git a/internal/store/session.go b/internal/state/store/session.go similarity index 98% rename from internal/store/session.go rename to internal/state/store/session.go index a027438294..a5d07ae844 100644 --- a/internal/store/session.go +++ b/internal/state/store/session.go @@ -4,8 +4,8 @@ // This first slice owns the session-artifact sidecars — the files and // directories that live beside a session's .jsonl (branch metadata, goal state, // checkpoints, background-job artifacts, the cleanup-pending marker). They were -// previously derived independently in internal/agent, internal/jobs, -// internal/control and internal/acp, each re-spelling the suffix convention; a +// previously derived independently in internal/runtime/agent, internal/runtime/jobs, +// internal/session/control and internal/frontend/acp, each re-spelling the suffix convention; a // layout change meant hunting across packages. Centralizing them here makes // store the one place that knows where a session's artifacts go. // diff --git a/internal/store/session_test.go b/internal/state/store/session_test.go similarity index 100% rename from internal/store/session_test.go rename to internal/state/store/session_test.go diff --git a/internal/store/subagent_name_test.go b/internal/state/store/subagent_name_test.go similarity index 100% rename from internal/store/subagent_name_test.go rename to internal/state/store/subagent_name_test.go diff --git a/internal/trajectory/audit_routing_test.go b/internal/state/trajectory/audit_routing_test.go similarity index 96% rename from internal/trajectory/audit_routing_test.go rename to internal/state/trajectory/audit_routing_test.go index db392a0a07..7473a7fe18 100644 --- a/internal/trajectory/audit_routing_test.go +++ b/internal/state/trajectory/audit_routing_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" ) // The bug this guards: SubagentHandoffAudit had a producer, a struct, an diff --git a/internal/trajectory/coalesce_test.go b/internal/state/trajectory/coalesce_test.go similarity index 98% rename from internal/trajectory/coalesce_test.go rename to internal/state/trajectory/coalesce_test.go index c2ac309ae8..8f176f7565 100644 --- a/internal/trajectory/coalesce_test.go +++ b/internal/state/trajectory/coalesce_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" ) func recorderAt(t *testing.T, name string, sink event.Sink) (*Recorder, string) { diff --git a/internal/trajectory/recorder.go b/internal/state/trajectory/recorder.go similarity index 99% rename from internal/trajectory/recorder.go rename to internal/state/trajectory/recorder.go index 4beb6e5f85..d9379cbd1c 100644 --- a/internal/trajectory/recorder.go +++ b/internal/state/trajectory/recorder.go @@ -12,9 +12,9 @@ import ( "sync" "time" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/evidence" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/runtime/evidence" ) // SchemaVersion identifies the record layout; bump on breaking changes. diff --git a/internal/trajectory/recorder_test.go b/internal/state/trajectory/recorder_test.go similarity index 98% rename from internal/trajectory/recorder_test.go rename to internal/state/trajectory/recorder_test.go index e286b65b21..9f541dec0d 100644 --- a/internal/trajectory/recorder_test.go +++ b/internal/state/trajectory/recorder_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/evidence" ) type capabilitySink struct { diff --git a/internal/usagecatalog/benchmark_test.go b/internal/state/usagecatalog/benchmark_test.go similarity index 100% rename from internal/usagecatalog/benchmark_test.go rename to internal/state/usagecatalog/benchmark_test.go diff --git a/internal/usagecatalog/catalog.go b/internal/state/usagecatalog/catalog.go similarity index 99% rename from internal/usagecatalog/catalog.go rename to internal/state/usagecatalog/catalog.go index 57f7d9a849..b13abc8ebf 100644 --- a/internal/usagecatalog/catalog.go +++ b/internal/state/usagecatalog/catalog.go @@ -19,10 +19,10 @@ import ( "sync/atomic" "time" - "reasonix/internal/billing" + "reasonix/internal/model/billing" - "reasonix/internal/config" - "reasonix/internal/projectiondb" + "reasonix/internal/contract/config" + "reasonix/internal/state/projectiondb" ) // SchemaVersion names the projection file, so a bump retires the old one diff --git a/internal/usagecatalog/catalog_test.go b/internal/state/usagecatalog/catalog_test.go similarity index 98% rename from internal/usagecatalog/catalog_test.go rename to internal/state/usagecatalog/catalog_test.go index 8840310663..0704bc2c10 100644 --- a/internal/usagecatalog/catalog_test.go +++ b/internal/state/usagecatalog/catalog_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestReconcileFileAndDuplicateReceiptAreIdempotent(t *testing.T) { @@ -117,7 +117,7 @@ func TestReadyRejectsSameSizeRewriteWithDifferentMtime(t *testing.T) { } // Two currencies on one key must not become one number. The JSONL path in -// internal/stats enforces this and is covered there; the catalog is what +// internal/state/stats enforces this and is covered there; the catalog is what // answers once it is ready, so the same invariant needs proving here. func TestCostsStaySeparatePerCurrencyInTheProjection(t *testing.T) { t.Parallel() diff --git a/internal/usagecatalog/close_lifecycle_test.go b/internal/state/usagecatalog/close_lifecycle_test.go similarity index 95% rename from internal/usagecatalog/close_lifecycle_test.go rename to internal/state/usagecatalog/close_lifecycle_test.go index 8fa970b4de..9bc0e1dd01 100644 --- a/internal/usagecatalog/close_lifecycle_test.go +++ b/internal/state/usagecatalog/close_lifecycle_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestCloseCanBeAwaitedAfterCanceledCaller(t *testing.T) { diff --git a/internal/usagecatalog/rebuild.go b/internal/state/usagecatalog/rebuild.go similarity index 97% rename from internal/usagecatalog/rebuild.go rename to internal/state/usagecatalog/rebuild.go index f7ef6fa948..9a7b2e6428 100644 --- a/internal/usagecatalog/rebuild.go +++ b/internal/state/usagecatalog/rebuild.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "reasonix/internal/projectiondb" + "reasonix/internal/state/projectiondb" ) // Rebuild replaces only the disposable usage projection after replaying the diff --git a/internal/usagecatalog/rebuild_test.go b/internal/state/usagecatalog/rebuild_test.go similarity index 97% rename from internal/usagecatalog/rebuild_test.go rename to internal/state/usagecatalog/rebuild_test.go index 59c06674b7..220b8ebb0d 100644 --- a/internal/usagecatalog/rebuild_test.go +++ b/internal/state/usagecatalog/rebuild_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestRebuildReplacesStaleUsageProjection(t *testing.T) { diff --git a/internal/usagereport/usagereport.go b/internal/state/usagereport/usagereport.go similarity index 98% rename from internal/usagereport/usagereport.go rename to internal/state/usagereport/usagereport.go index 4428652714..76716e2c75 100644 --- a/internal/usagereport/usagereport.go +++ b/internal/state/usagereport/usagereport.go @@ -8,7 +8,7 @@ import ( "encoding/json" "os" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) // Version is the schema this package writes. Readers accept older ones. diff --git a/internal/workgroup/doc.go b/internal/state/workgroup/doc.go similarity index 100% rename from internal/workgroup/doc.go rename to internal/state/workgroup/doc.go diff --git a/internal/workgroup/workgroup.go b/internal/state/workgroup/workgroup.go similarity index 98% rename from internal/workgroup/workgroup.go rename to internal/state/workgroup/workgroup.go index a8c30d982c..d459245fd6 100644 --- a/internal/workgroup/workgroup.go +++ b/internal/state/workgroup/workgroup.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "reasonix/internal/event" - "reasonix/internal/eventwire" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" ) // Call is one tool invocation as an atom. See doc.go for the three lifecycles diff --git a/internal/workspacelease/lease.go b/internal/state/workspacelease/lease.go similarity index 99% rename from internal/workspacelease/lease.go rename to internal/state/workspacelease/lease.go index 6fc7ba2d59..aae47168dd 100644 --- a/internal/workspacelease/lease.go +++ b/internal/state/workspacelease/lease.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "reasonix/internal/fileutil" + "reasonix/internal/base/fileutil" ) const retryInterval = 75 * time.Millisecond diff --git a/internal/workspacelease/lease_test.go b/internal/state/workspacelease/lease_test.go similarity index 99% rename from internal/workspacelease/lease_test.go rename to internal/state/workspacelease/lease_test.go index deeb5179d5..e844cd29b3 100644 --- a/internal/workspacelease/lease_test.go +++ b/internal/state/workspacelease/lease_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // withWaitGrace shortens the silence a contended acquisition keeps, so a test diff --git a/internal/workspacelease/lock_unix.go b/internal/state/workspacelease/lock_unix.go similarity index 100% rename from internal/workspacelease/lock_unix.go rename to internal/state/workspacelease/lock_unix.go diff --git a/internal/workspacelease/lock_windows.go b/internal/state/workspacelease/lock_windows.go similarity index 100% rename from internal/workspacelease/lock_windows.go rename to internal/state/workspacelease/lock_windows.go diff --git a/internal/workspacelease/stats.go b/internal/state/workspacelease/stats.go similarity index 100% rename from internal/workspacelease/stats.go rename to internal/state/workspacelease/stats.go diff --git a/internal/workspacelease/stats_test.go b/internal/state/workspacelease/stats_test.go similarity index 100% rename from internal/workspacelease/stats_test.go rename to internal/state/workspacelease/stats_test.go diff --git a/internal/tool/builtin/bash.go b/internal/tools/builtin/bash.go similarity index 98% rename from internal/tool/builtin/bash.go rename to internal/tools/builtin/bash.go index dd97ff1a24..fbc1219dd0 100644 --- a/internal/tool/builtin/bash.go +++ b/internal/tools/builtin/bash.go @@ -18,15 +18,15 @@ import ( "mvdan.cc/sh/v3/syntax" - "reasonix/internal/i18n" - "reasonix/internal/jobs" - "reasonix/internal/proc" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/sessiontemp" - "reasonix/internal/shellparse" - "reasonix/internal/shellrun" - "reasonix/internal/tool" + "reasonix/internal/base/i18n" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" + "reasonix/internal/base/shellparse" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/jobs" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/sessiontemp" + "reasonix/internal/tools/shellrun" ) const ( diff --git a/internal/tool/builtin/bash_cancel_test.go b/internal/tools/builtin/bash_cancel_test.go similarity index 95% rename from internal/tool/builtin/bash_cancel_test.go rename to internal/tools/builtin/bash_cancel_test.go index 26f633073b..71b80c785e 100644 --- a/internal/tool/builtin/bash_cancel_test.go +++ b/internal/tools/builtin/bash_cancel_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" ) // TestBashCancelReturnsPromptly proves a cancelled bash run stops fast instead of diff --git a/internal/tool/builtin/bash_cancel_windows_test.go b/internal/tools/builtin/bash_cancel_windows_test.go similarity index 98% rename from internal/tool/builtin/bash_cancel_windows_test.go rename to internal/tools/builtin/bash_cancel_windows_test.go index 57fa3675bf..519f0174ad 100644 --- a/internal/tool/builtin/bash_cancel_windows_test.go +++ b/internal/tools/builtin/bash_cancel_windows_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) func TestBashCancelKillsWindowsChildProcessTree(t *testing.T) { diff --git a/internal/tool/builtin/bash_env_test.go b/internal/tools/builtin/bash_env_test.go similarity index 97% rename from internal/tool/builtin/bash_env_test.go rename to internal/tools/builtin/bash_env_test.go index 129f778ef6..a7289033bc 100644 --- a/internal/tool/builtin/bash_env_test.go +++ b/internal/tools/builtin/bash_env_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/testenv" + "reasonix/internal/base/secrets" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) func TestBashMergesLoginShellPath(t *testing.T) { diff --git a/internal/tool/builtin/bash_external.go b/internal/tools/builtin/bash_external.go similarity index 97% rename from internal/tool/builtin/bash_external.go rename to internal/tools/builtin/bash_external.go index 283b019225..4ff81f2133 100644 --- a/internal/tool/builtin/bash_external.go +++ b/internal/tools/builtin/bash_external.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // refuseExternalRef stops a command naming a folder mounted read-only from diff --git a/internal/tool/builtin/bash_external_test.go b/internal/tools/builtin/bash_external_test.go similarity index 98% rename from internal/tool/builtin/bash_external_test.go rename to internal/tools/builtin/bash_external_test.go index ac626497e6..624ea16481 100644 --- a/internal/tool/builtin/bash_external_test.go +++ b/internal/tools/builtin/bash_external_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // A dropped external folder is reachable by the read tools and by nothing else. diff --git a/internal/tool/builtin/bash_foreground.go b/internal/tools/builtin/bash_foreground.go similarity index 96% rename from internal/tool/builtin/bash_foreground.go rename to internal/tools/builtin/bash_foreground.go index 297ff388e8..e1d527b121 100644 --- a/internal/tool/builtin/bash_foreground.go +++ b/internal/tools/builtin/bash_foreground.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "reasonix/internal/sandbox" - "reasonix/internal/shellrun" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" + "reasonix/internal/tools/shellrun" ) // runForegroundDetailed uses the shared shellrun collector so model bash and diff --git a/internal/tool/builtin/bash_heredoc_test.go b/internal/tools/builtin/bash_heredoc_test.go similarity index 98% rename from internal/tool/builtin/bash_heredoc_test.go rename to internal/tools/builtin/bash_heredoc_test.go index ab8ca8eb8c..fd12a86be3 100644 --- a/internal/tool/builtin/bash_heredoc_test.go +++ b/internal/tools/builtin/bash_heredoc_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) func TestBashHereDocIssue5624CommandsReturnPromptly(t *testing.T) { diff --git a/internal/tool/builtin/bash_nul.go b/internal/tools/builtin/bash_nul.go similarity index 97% rename from internal/tool/builtin/bash_nul.go rename to internal/tools/builtin/bash_nul.go index f9c73585a4..3ce8f737ba 100644 --- a/internal/tool/builtin/bash_nul.go +++ b/internal/tools/builtin/bash_nul.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "reasonix/internal/sandbox" + "reasonix/internal/safety/sandbox" ) // nulWatch notices a regular file named NUL that a Git Bash command created in diff --git a/internal/tool/builtin/bash_nul_test.go b/internal/tools/builtin/bash_nul_test.go similarity index 96% rename from internal/tool/builtin/bash_nul_test.go rename to internal/tools/builtin/bash_nul_test.go index eee6de8d4f..694bfc3a49 100644 --- a/internal/tool/builtin/bash_nul_test.go +++ b/internal/tools/builtin/bash_nul_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) // makeNUL writes a regular file named NUL. On Windows only the extended-length diff --git a/internal/tool/builtin/bash_powershell_test.go b/internal/tools/builtin/bash_powershell_test.go similarity index 98% rename from internal/tool/builtin/bash_powershell_test.go rename to internal/tools/builtin/bash_powershell_test.go index bea043a266..80a1dd022f 100644 --- a/internal/tool/builtin/bash_powershell_test.go +++ b/internal/tools/builtin/bash_powershell_test.go @@ -11,9 +11,9 @@ import ( "testing" "unicode/utf8" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" ) func powershellPath(t *testing.T) string { diff --git a/internal/tool/builtin/bash_reap_test.go b/internal/tools/builtin/bash_reap_test.go similarity index 98% rename from internal/tool/builtin/bash_reap_test.go rename to internal/tools/builtin/bash_reap_test.go index 5e31705dfb..f974333849 100644 --- a/internal/tool/builtin/bash_reap_test.go +++ b/internal/tools/builtin/bash_reap_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "reasonix/internal/proc" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/proc" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) // TestReapTreeKillsGroupStragglers covers #3702: a foreground command that diff --git a/internal/tool/builtin/bash_sandbox_escape_test.go b/internal/tools/builtin/bash_sandbox_escape_test.go similarity index 98% rename from internal/tool/builtin/bash_sandbox_escape_test.go rename to internal/tools/builtin/bash_sandbox_escape_test.go index d658666483..50b4ab97a2 100644 --- a/internal/tool/builtin/bash_sandbox_escape_test.go +++ b/internal/tools/builtin/bash_sandbox_escape_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/jobs" - "reasonix/internal/sandbox" + "reasonix/internal/contract/event" + "reasonix/internal/runtime/jobs" + "reasonix/internal/safety/sandbox" ) type fakeSandboxEscapeApprover struct { diff --git a/internal/tool/builtin/bash_session_temp_test.go b/internal/tools/builtin/bash_session_temp_test.go similarity index 97% rename from internal/tool/builtin/bash_session_temp_test.go rename to internal/tools/builtin/bash_session_temp_test.go index df299bf9e1..8a9767a0f9 100644 --- a/internal/tool/builtin/bash_session_temp_test.go +++ b/internal/tools/builtin/bash_session_temp_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "reasonix/internal/sandbox" - "reasonix/internal/sessiontemp" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/sessiontemp" ) func TestBashSharesSessionTempAcrossCalls(t *testing.T) { diff --git a/internal/tool/builtin/bash_timeout_test.go b/internal/tools/builtin/bash_timeout_test.go similarity index 99% rename from internal/tool/builtin/bash_timeout_test.go rename to internal/tools/builtin/bash_timeout_test.go index fc22a3ffd6..0a683c9051 100644 --- a/internal/tool/builtin/bash_timeout_test.go +++ b/internal/tools/builtin/bash_timeout_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) func TestBashForegroundTimeoutConfig(t *testing.T) { diff --git a/internal/tool/builtin/bgjobs.go b/internal/tools/builtin/bgjobs.go similarity index 98% rename from internal/tool/builtin/bgjobs.go rename to internal/tools/builtin/bgjobs.go index 61e88a390a..049b3382d9 100644 --- a/internal/tool/builtin/bgjobs.go +++ b/internal/tools/builtin/bgjobs.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "reasonix/internal/evidence" - "reasonix/internal/jobs" - "reasonix/internal/planmode" - "reasonix/internal/tool" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" ) // bash_output / kill_shell / wait operate the background jobs registered by diff --git a/internal/tool/builtin/bgjobs_test.go b/internal/tools/builtin/bgjobs_test.go similarity index 98% rename from internal/tool/builtin/bgjobs_test.go rename to internal/tools/builtin/bgjobs_test.go index 987a3efdf6..4d0f0d5323 100644 --- a/internal/tool/builtin/bgjobs_test.go +++ b/internal/tools/builtin/bgjobs_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "reasonix/internal/event" - "reasonix/internal/evidence" - "reasonix/internal/jobs" - "reasonix/internal/planmode" + "reasonix/internal/contract/event" + "reasonix/internal/contract/planmode" + "reasonix/internal/runtime/evidence" + "reasonix/internal/runtime/jobs" ) // End-to-end through the actual tools: a background bash job runs under a manager diff --git a/internal/tool/builtin/browser.go b/internal/tools/builtin/browser.go similarity index 99% rename from internal/tool/builtin/browser.go rename to internal/tools/builtin/browser.go index 72c40d7891..7754321b10 100644 --- a/internal/tool/builtin/browser.go +++ b/internal/tools/builtin/browser.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "reasonix/internal/browser" - "reasonix/internal/permission" - "reasonix/internal/textutil" - "reasonix/internal/tool" + "reasonix/internal/base/textutil" + "reasonix/internal/contract/tool" + "reasonix/internal/platform/browser" + "reasonix/internal/safety/permission" ) func init() { diff --git a/internal/tool/builtin/browser_test.go b/internal/tools/builtin/browser_test.go similarity index 99% rename from internal/tool/builtin/browser_test.go rename to internal/tools/builtin/browser_test.go index d595e2acd1..8f1d7ebc0c 100644 --- a/internal/tool/builtin/browser_test.go +++ b/internal/tools/builtin/browser_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/browser" + "reasonix/internal/platform/browser" ) func TestBrowserPermissionArgsCarryTheHostsOrigin(t *testing.T) { diff --git a/internal/tool/builtin/builtin_test.go b/internal/tools/builtin/builtin_test.go similarity index 99% rename from internal/tool/builtin/builtin_test.go rename to internal/tools/builtin/builtin_test.go index f17ac6cabb..40cd3d702b 100644 --- a/internal/tool/builtin/builtin_test.go +++ b/internal/tools/builtin/builtin_test.go @@ -17,8 +17,8 @@ import ( "go.uber.org/goleak" "golang.org/x/text/encoding/simplifiedchinese" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) // argsJSON marshals m into the JSON form a tool expects. Tests must not build diff --git a/internal/tool/builtin/clientio.go b/internal/tools/builtin/clientio.go similarity index 100% rename from internal/tool/builtin/clientio.go rename to internal/tools/builtin/clientio.go diff --git a/internal/tool/builtin/clientio_test.go b/internal/tools/builtin/clientio_test.go similarity index 98% rename from internal/tool/builtin/clientio_test.go rename to internal/tools/builtin/clientio_test.go index 1fe5039ea4..bb60b35778 100644 --- a/internal/tool/builtin/clientio_test.go +++ b/internal/tools/builtin/clientio_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/testenv" + "reasonix/internal/base/secrets" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) // fakeOverlay serves a fixed path→content map and records writes. diff --git a/internal/tool/builtin/codeindex.go b/internal/tools/builtin/codeindex.go similarity index 99% rename from internal/tool/builtin/codeindex.go rename to internal/tools/builtin/codeindex.go index 0426fffa44..c91b01bbb3 100644 --- a/internal/tool/builtin/codeindex.go +++ b/internal/tools/builtin/codeindex.go @@ -15,7 +15,7 @@ import ( "sort" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func init() { tool.RegisterBuiltin(codeIndex{}) } diff --git a/internal/tool/builtin/codeindex_test.go b/internal/tools/builtin/codeindex_test.go similarity index 99% rename from internal/tool/builtin/codeindex_test.go rename to internal/tools/builtin/codeindex_test.go index 0974c4bf8c..af24a0b4e2 100644 --- a/internal/tool/builtin/codeindex_test.go +++ b/internal/tools/builtin/codeindex_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestCodeIndexSearchGoSymbols(t *testing.T) { diff --git a/internal/tool/builtin/codeindex_treesitter.go b/internal/tools/builtin/codeindex_treesitter.go similarity index 100% rename from internal/tool/builtin/codeindex_treesitter.go rename to internal/tools/builtin/codeindex_treesitter.go diff --git a/internal/tool/builtin/codeindex_treesitter_stub.go b/internal/tools/builtin/codeindex_treesitter_stub.go similarity index 100% rename from internal/tool/builtin/codeindex_treesitter_stub.go rename to internal/tools/builtin/codeindex_treesitter_stub.go diff --git a/internal/tool/builtin/codeindex_treesitter_test.go b/internal/tools/builtin/codeindex_treesitter_test.go similarity index 97% rename from internal/tool/builtin/codeindex_treesitter_test.go rename to internal/tools/builtin/codeindex_treesitter_test.go index b76109cff0..df0d1826e0 100644 --- a/internal/tool/builtin/codeindex_treesitter_test.go +++ b/internal/tools/builtin/codeindex_treesitter_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestCodeIndexTreeSitterTypeScriptMethods(t *testing.T) { diff --git a/internal/tool/builtin/completestep.go b/internal/tools/builtin/completestep.go similarity index 99% rename from internal/tool/builtin/completestep.go rename to internal/tools/builtin/completestep.go index 8bfed60fa9..dfc7e9e399 100644 --- a/internal/tool/builtin/completestep.go +++ b/internal/tools/builtin/completestep.go @@ -9,11 +9,11 @@ import ( "strings" "sync" - "reasonix/internal/evidence" - "reasonix/internal/instruction" - "reasonix/internal/planmode" - "reasonix/internal/provider" - "reasonix/internal/tool" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/provider" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/instruction" ) func init() { tool.RegisterBuiltin(completeStep{}) } diff --git a/internal/tool/builtin/completestep_test.go b/internal/tools/builtin/completestep_test.go similarity index 98% rename from internal/tool/builtin/completestep_test.go rename to internal/tools/builtin/completestep_test.go index 14b58fcc29..fbcfeadf5f 100644 --- a/internal/tool/builtin/completestep_test.go +++ b/internal/tools/builtin/completestep_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/evidence" - "reasonix/internal/instruction" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/evidence" + "reasonix/internal/state/instruction" ) func TestTodoInventoryListsTurnTodos(t *testing.T) { @@ -95,13 +95,13 @@ func TestCompleteStepVerifiesHostReceipts(t *testing.T) { ledger.Record(evidence.Receipt{ ToolName: "write_file", Success: true, - Paths: []string{"internal/evidence/evidence.go"}, + Paths: []string{"internal/runtime/evidence/evidence.go"}, Write: true, }) ledger.Record(evidence.Receipt{ ToolName: "read_file", Success: true, - Paths: []string{"internal/tool/builtin/completestep.go"}, + Paths: []string{"internal/tools/builtin/completestep.go"}, Read: true, }) ctx := evidence.WithLedger(context.Background(), ledger) @@ -111,8 +111,8 @@ func TestCompleteStepVerifiesHostReceipts(t *testing.T) { "result":"complete_step checks host receipts", "evidence":[ {"kind":"verification","summary":"tests passed","command":"go test ./internal/..."}, - {"kind":"diff","summary":"ledger package added","paths":["internal/evidence/evidence.go"]}, - {"kind":"files","summary":"complete_step implementation inspected","paths":["internal/tool/builtin/completestep.go"]} + {"kind":"diff","summary":"ledger package added","paths":["internal/runtime/evidence/evidence.go"]}, + {"kind":"files","summary":"complete_step implementation inspected","paths":["internal/tools/builtin/completestep.go"]} ]}`)) if err != nil { t.Fatalf("host-verified evidence rejected: %v", err) @@ -191,7 +191,7 @@ func TestCompleteStepRejectsManualAloneOnceTheTurnHasReceipts(t *testing.T) { Success: true, Mutation: true, Write: true, - Paths: []string{"internal/agent/agent.go"}, + Paths: []string{"internal/runtime/agent/agent.go"}, }) ctx := evidence.WithLedger(context.Background(), ledger) @@ -211,7 +211,7 @@ func TestCompleteStepRejectsManualAloneOnceTheTurnHasReceipts(t *testing.T) { "step":"Manual check", "result":"operator confirmed behavior", "evidence":[ - {"kind":"diff","summary":"rewrote the gate","paths":["internal/agent/agent.go"]}, + {"kind":"diff","summary":"rewrote the gate","paths":["internal/runtime/agent/agent.go"]}, {"kind":"manual","summary":"checked the visible output"}]}`)) if err != nil { t.Fatalf("manual alongside a cited write should be accepted: %v", err) @@ -651,7 +651,7 @@ func TestCompleteStepRejectionListsRanCommands(t *testing.T) { _, err := completeStep{}.Execute(ctx, json.RawMessage(`{ "step":"x","result":"y", - "evidence":[{"kind":"verification","summary":"claimed","command":"go test ./internal/nilutil/... ./internal/fileutil/..."}]}`)) + "evidence":[{"kind":"verification","summary":"claimed","command":"go test ./internal/base/nilutil/... ./internal/base/fileutil/..."}]}`)) if err == nil || !strings.Contains(err.Error(), "wc -l scripts/test_lines.txt") { t.Fatalf("rejection should list the commands that actually ran, got %v", err) } @@ -674,7 +674,7 @@ func TestCompleteStepSessionFallbackUsesNormalizedMatching(t *testing.T) { msgs := []provider.Message{ {Role: provider.RoleAssistant, ToolCalls: []provider.ToolCall{{ ID: "c1", Name: "bash", - Arguments: `{"command":"go test ./internal/tool/... -count=1 -timeout 60s 2>&1 | tail -10"}`, + Arguments: `{"command":"go test ./internal/contract/tool/... -count=1 -timeout 60s 2>&1 | tail -10"}`, }}}, {Role: provider.RoleTool, ToolCallID: "c1", Name: "bash", Content: "ok\nPASS"}, } @@ -683,7 +683,7 @@ func TestCompleteStepSessionFallbackUsesNormalizedMatching(t *testing.T) { if _, err := (completeStep{}).Execute(ctx, json.RawMessage(`{ "step":"x","result":"y", - "evidence":[{"kind":"verification","summary":"tool tests pass","command":"go test ./internal/tool/... -count=1 -timeout 60s"}]}`)); err != nil { + "evidence":[{"kind":"verification","summary":"tool tests pass","command":"go test ./internal/contract/tool/... -count=1 -timeout 60s"}]}`)); err != nil { t.Fatalf("cross-turn citation of a ran command rejected: %v", err) } } diff --git a/internal/tool/builtin/compress.go b/internal/tools/builtin/compress.go similarity index 99% rename from internal/tool/builtin/compress.go rename to internal/tools/builtin/compress.go index 60b369a9d6..c2abb221b8 100644 --- a/internal/tool/builtin/compress.go +++ b/internal/tools/builtin/compress.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) const ( diff --git a/internal/tool/builtin/computer.go b/internal/tools/builtin/computer.go similarity index 98% rename from internal/tool/builtin/computer.go rename to internal/tools/builtin/computer.go index 0bd9d24150..0fa6fc2ff8 100644 --- a/internal/tool/builtin/computer.go +++ b/internal/tools/builtin/computer.go @@ -7,9 +7,9 @@ import ( "runtime" "strings" - "reasonix/internal/computer" - "reasonix/internal/permission" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/platform/computer" + "reasonix/internal/safety/permission" ) func init() { diff --git a/internal/tool/builtin/computer_test.go b/internal/tools/builtin/computer_test.go similarity index 96% rename from internal/tool/builtin/computer_test.go rename to internal/tools/builtin/computer_test.go index 01a6be7301..fb8cf14568 100644 --- a/internal/tool/builtin/computer_test.go +++ b/internal/tools/builtin/computer_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/computer" - "reasonix/internal/permission" + "reasonix/internal/platform/computer" + "reasonix/internal/safety/permission" ) func TestComputerToolsWithoutAHelperSayItIsUnavailable(t *testing.T) { diff --git a/internal/tool/builtin/confine.go b/internal/tools/builtin/confine.go similarity index 98% rename from internal/tool/builtin/confine.go rename to internal/tools/builtin/confine.go index 77c08a0db8..b10bb68d31 100644 --- a/internal/tool/builtin/confine.go +++ b/internal/tools/builtin/confine.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "reasonix/internal/netclient" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/base/netclient" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/sessiontemp" ) // ConfineBash returns the bash built-in bound to an OS-sandbox spec, overriding diff --git a/internal/tool/builtin/confine_test.go b/internal/tools/builtin/confine_test.go similarity index 99% rename from internal/tool/builtin/confine_test.go rename to internal/tools/builtin/confine_test.go index 3758c5279b..5bd849101a 100644 --- a/internal/tool/builtin/confine_test.go +++ b/internal/tools/builtin/confine_test.go @@ -10,12 +10,12 @@ import ( "strings" "testing" - "reasonix/internal/config" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/sessiontemp" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/secrets" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/config" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/sessiontemp" ) func isolateBuiltinTestUserState(t *testing.T) string { diff --git a/internal/tool/builtin/contextbudget.go b/internal/tools/builtin/contextbudget.go similarity index 97% rename from internal/tool/builtin/contextbudget.go rename to internal/tools/builtin/contextbudget.go index 9219a79b7f..f7ff4ac39e 100644 --- a/internal/tool/builtin/contextbudget.go +++ b/internal/tools/builtin/contextbudget.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func init() { tool.RegisterBuiltin(contextBudget{}) } diff --git a/internal/tool/builtin/contextual_visibility_test.go b/internal/tools/builtin/contextual_visibility_test.go similarity index 93% rename from internal/tool/builtin/contextual_visibility_test.go rename to internal/tools/builtin/contextual_visibility_test.go index d381350dee..9d209bed7b 100644 --- a/internal/tool/builtin/contextual_visibility_test.go +++ b/internal/tools/builtin/contextual_visibility_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "reasonix/internal/jobs" - "reasonix/internal/planmode" - "reasonix/internal/tool" + "reasonix/internal/contract/planmode" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/jobs" ) type visibilityRecorder struct{} diff --git a/internal/tool/builtin/criterion_citation_test.go b/internal/tools/builtin/criterion_citation_test.go similarity index 97% rename from internal/tool/builtin/criterion_citation_test.go rename to internal/tools/builtin/criterion_citation_test.go index 1d7edb6d8d..07137f935c 100644 --- a/internal/tool/builtin/criterion_citation_test.go +++ b/internal/tools/builtin/criterion_citation_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) func criterionCitationArgs(t *testing.T, criterionID string) json.RawMessage { diff --git a/internal/tool/builtin/crlf_edit_test.go b/internal/tools/builtin/crlf_edit_test.go similarity index 98% rename from internal/tool/builtin/crlf_edit_test.go rename to internal/tools/builtin/crlf_edit_test.go index 0cc68e3add..c5a9d095c9 100644 --- a/internal/tool/builtin/crlf_edit_test.go +++ b/internal/tools/builtin/crlf_edit_test.go @@ -9,7 +9,7 @@ import ( "testing" "golang.org/x/text/encoding/simplifiedchinese" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func encGBK(t *testing.T, s string) []byte { diff --git a/internal/tool/builtin/delete_range.go b/internal/tools/builtin/delete_range.go similarity index 99% rename from internal/tool/builtin/delete_range.go rename to internal/tools/builtin/delete_range.go index e3f9bb69ee..8f3b3bf80a 100644 --- a/internal/tool/builtin/delete_range.go +++ b/internal/tools/builtin/delete_range.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/diff" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/base/diff" + "reasonix/internal/contract/tool" + "reasonix/internal/state/sessiontemp" ) func init() { tool.RegisterBuiltin(deleteRange{}) } diff --git a/internal/tool/builtin/delete_range_samedge_test.go b/internal/tools/builtin/delete_range_samedge_test.go similarity index 96% rename from internal/tool/builtin/delete_range_samedge_test.go rename to internal/tools/builtin/delete_range_samedge_test.go index 390b0047a0..bd7c2e008f 100644 --- a/internal/tool/builtin/delete_range_samedge_test.go +++ b/internal/tools/builtin/delete_range_samedge_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestDeleteRangeSameAnchorNonInclusiveNoDup probes the degenerate but valid diff --git a/internal/tool/builtin/delete_range_test.go b/internal/tools/builtin/delete_range_test.go similarity index 99% rename from internal/tool/builtin/delete_range_test.go rename to internal/tools/builtin/delete_range_test.go index b16a2ea38e..4c4e57f740 100644 --- a/internal/tool/builtin/delete_range_test.go +++ b/internal/tools/builtin/delete_range_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestDeleteRangeBasic(t *testing.T) { diff --git a/internal/tool/builtin/delete_symbol.go b/internal/tools/builtin/delete_symbol.go similarity index 98% rename from internal/tool/builtin/delete_symbol.go rename to internal/tools/builtin/delete_symbol.go index 258f756805..c4e8b00e16 100644 --- a/internal/tool/builtin/delete_symbol.go +++ b/internal/tools/builtin/delete_symbol.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/diff" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/base/diff" + "reasonix/internal/contract/tool" + "reasonix/internal/state/sessiontemp" ) func init() { tool.RegisterBuiltin(deleteSymbol{}) } diff --git a/internal/tool/builtin/delete_symbol_doc_test.go b/internal/tools/builtin/delete_symbol_doc_test.go similarity index 98% rename from internal/tool/builtin/delete_symbol_doc_test.go rename to internal/tools/builtin/delete_symbol_doc_test.go index aaee424301..3be85a7c0a 100644 --- a/internal/tool/builtin/delete_symbol_doc_test.go +++ b/internal/tools/builtin/delete_symbol_doc_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestDeleteSymbolRemovesDocComment probes whether deleting a documented symbol diff --git a/internal/tool/builtin/delete_symbol_test.go b/internal/tools/builtin/delete_symbol_test.go similarity index 99% rename from internal/tool/builtin/delete_symbol_test.go rename to internal/tools/builtin/delete_symbol_test.go index cac822ada2..0b4c545b14 100644 --- a/internal/tool/builtin/delete_symbol_test.go +++ b/internal/tools/builtin/delete_symbol_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestDeleteSymbolGoFunc(t *testing.T) { diff --git a/internal/tool/builtin/e2e_encoding_test.go b/internal/tools/builtin/e2e_encoding_test.go similarity index 98% rename from internal/tool/builtin/e2e_encoding_test.go rename to internal/tools/builtin/e2e_encoding_test.go index 92a88923e2..44052749e9 100644 --- a/internal/tool/builtin/e2e_encoding_test.go +++ b/internal/tools/builtin/e2e_encoding_test.go @@ -12,8 +12,8 @@ import ( "golang.org/x/text/encoding/simplifiedchinese" "golang.org/x/text/transform" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) func gbkBytes(t *testing.T, s string) []byte { diff --git a/internal/tool/builtin/editfile.go b/internal/tools/builtin/editfile.go similarity index 97% rename from internal/tool/builtin/editfile.go rename to internal/tools/builtin/editfile.go index cc2b02eb6d..4596cf80c8 100644 --- a/internal/tool/builtin/editfile.go +++ b/internal/tools/builtin/editfile.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/state/sessiontemp" ) func init() { tool.RegisterBuiltin(editFile{}) } diff --git a/internal/tool/builtin/editsource.go b/internal/tools/builtin/editsource.go similarity index 97% rename from internal/tool/builtin/editsource.go rename to internal/tools/builtin/editsource.go index 8e78125f8a..f1bf5888d3 100644 --- a/internal/tool/builtin/editsource.go +++ b/internal/tools/builtin/editsource.go @@ -4,7 +4,7 @@ import ( "context" "path/filepath" - fileenc "reasonix/internal/fileutil/encoding" + fileenc "reasonix/internal/base/fileutil/encoding" ) // editSource is the file state a read-modify-write tool works against, plus the diff --git a/internal/tool/builtin/editsource_test.go b/internal/tools/builtin/editsource_test.go similarity index 99% rename from internal/tool/builtin/editsource_test.go rename to internal/tools/builtin/editsource_test.go index 90aefc4584..82ed4a05c7 100644 --- a/internal/tool/builtin/editsource_test.go +++ b/internal/tools/builtin/editsource_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // The disk copy is the last saved version; the overlay holds the user's unsaved diff --git a/internal/tool/builtin/encoding_helpers.go b/internal/tools/builtin/encoding_helpers.go similarity index 99% rename from internal/tool/builtin/encoding_helpers.go rename to internal/tools/builtin/encoding_helpers.go index 63c85c0cbd..8f76024beb 100644 --- a/internal/tool/builtin/encoding_helpers.go +++ b/internal/tools/builtin/encoding_helpers.go @@ -6,8 +6,8 @@ import ( "slices" "strings" - "reasonix/internal/fileutil" - fileenc "reasonix/internal/fileutil/encoding" + "reasonix/internal/base/fileutil" + fileenc "reasonix/internal/base/fileutil/encoding" ) // readFileEncoded reads a file and decodes its encoding to UTF-8. diff --git a/internal/tool/builtin/fuzzy_edit_test.go b/internal/tools/builtin/fuzzy_edit_test.go similarity index 99% rename from internal/tool/builtin/fuzzy_edit_test.go rename to internal/tools/builtin/fuzzy_edit_test.go index bca3cf9c25..025dfa612c 100644 --- a/internal/tool/builtin/fuzzy_edit_test.go +++ b/internal/tools/builtin/fuzzy_edit_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestEditFileFuzzyTrailingWhitespace(t *testing.T) { diff --git a/internal/tool/builtin/gitignore.go b/internal/tools/builtin/gitignore.go similarity index 98% rename from internal/tool/builtin/gitignore.go rename to internal/tools/builtin/gitignore.go index 7215e5dd37..d374087640 100644 --- a/internal/tool/builtin/gitignore.go +++ b/internal/tools/builtin/gitignore.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "reasonix/internal/fileutil" - "reasonix/internal/gitignore" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/gitignore" ) // ignoreFrame is the cumulative ignore state at a directory: every applicable diff --git a/internal/tool/builtin/gitignore_e2e_test.go b/internal/tools/builtin/gitignore_e2e_test.go similarity index 99% rename from internal/tool/builtin/gitignore_e2e_test.go rename to internal/tools/builtin/gitignore_e2e_test.go index dd4ea733a9..8e69facac1 100644 --- a/internal/tool/builtin/gitignore_e2e_test.go +++ b/internal/tools/builtin/gitignore_e2e_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestGrepGlobalExcludesFile(t *testing.T) { diff --git a/internal/tool/builtin/gitignore_test.go b/internal/tools/builtin/gitignore_test.go similarity index 98% rename from internal/tool/builtin/gitignore_test.go rename to internal/tools/builtin/gitignore_test.go index fbad4a0994..6f46e13938 100644 --- a/internal/tool/builtin/gitignore_test.go +++ b/internal/tools/builtin/gitignore_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - fileencoding "reasonix/internal/fileutil/encoding" - "reasonix/internal/testenv" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/testenv" ) func writeFileT(t *testing.T, path, body string) { diff --git a/internal/tool/builtin/glob.go b/internal/tools/builtin/glob.go similarity index 98% rename from internal/tool/builtin/glob.go rename to internal/tools/builtin/glob.go index 8f3d6f0aed..e5566c436c 100644 --- a/internal/tool/builtin/glob.go +++ b/internal/tools/builtin/glob.go @@ -13,9 +13,9 @@ import ( "github.com/bmatcuk/doublestar/v4" - "reasonix/internal/fileutil" - "reasonix/internal/secrets" - "reasonix/internal/tool" + "reasonix/internal/base/fileutil" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/tool" ) func init() { tool.RegisterBuiltin(globTool{}) } diff --git a/internal/tool/builtin/glob_root_test.go b/internal/tools/builtin/glob_root_test.go similarity index 100% rename from internal/tool/builtin/glob_root_test.go rename to internal/tools/builtin/glob_root_test.go diff --git a/internal/tool/builtin/grep.go b/internal/tools/builtin/grep.go similarity index 98% rename from internal/tool/builtin/grep.go rename to internal/tools/builtin/grep.go index 5663bfd12c..d5785d916d 100644 --- a/internal/tool/builtin/grep.go +++ b/internal/tools/builtin/grep.go @@ -17,13 +17,13 @@ import ( "golang.org/x/text/transform" - "reasonix/internal/fileutil" - fileenc "reasonix/internal/fileutil/encoding" - "reasonix/internal/proc" - "reasonix/internal/sandbox" - "reasonix/internal/secrets" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/base/fileutil" + fileenc "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/base/proc" + "reasonix/internal/base/secrets" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/sessiontemp" ) const ( diff --git a/internal/tool/builtin/grep_cjk_peek_test.go b/internal/tools/builtin/grep_cjk_peek_test.go similarity index 100% rename from internal/tool/builtin/grep_cjk_peek_test.go rename to internal/tools/builtin/grep_cjk_peek_test.go diff --git a/internal/tool/builtin/grep_engine_test.go b/internal/tools/builtin/grep_engine_test.go similarity index 98% rename from internal/tool/builtin/grep_engine_test.go rename to internal/tools/builtin/grep_engine_test.go index 80ec35acbe..22744a2e31 100644 --- a/internal/tool/builtin/grep_engine_test.go +++ b/internal/tools/builtin/grep_engine_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) func TestGrepTimeoutClamp(t *testing.T) { diff --git a/internal/tool/builtin/grep_glob_test.go b/internal/tools/builtin/grep_glob_test.go similarity index 99% rename from internal/tool/builtin/grep_glob_test.go rename to internal/tools/builtin/grep_glob_test.go index fdcf71cfc7..bd9f8c8662 100644 --- a/internal/tool/builtin/grep_glob_test.go +++ b/internal/tools/builtin/grep_glob_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // grepGlobTree is one nested tree both engines search, so their answers can be diff --git a/internal/tool/builtin/grep_ignored_test.go b/internal/tools/builtin/grep_ignored_test.go similarity index 100% rename from internal/tool/builtin/grep_ignored_test.go rename to internal/tools/builtin/grep_ignored_test.go diff --git a/internal/tool/builtin/host_subject.go b/internal/tools/builtin/host_subject.go similarity index 100% rename from internal/tool/builtin/host_subject.go rename to internal/tools/builtin/host_subject.go diff --git a/internal/tool/builtin/host_subject_test.go b/internal/tools/builtin/host_subject_test.go similarity index 98% rename from internal/tool/builtin/host_subject_test.go rename to internal/tools/builtin/host_subject_test.go index 60221bce2a..36c6268db1 100644 --- a/internal/tool/builtin/host_subject_test.go +++ b/internal/tools/builtin/host_subject_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "reasonix/internal/permission" + "reasonix/internal/safety/permission" ) // A field the tool does not declare cannot become what the gate reads: the diff --git a/internal/tool/builtin/image_read_test.go b/internal/tools/builtin/image_read_test.go similarity index 96% rename from internal/tool/builtin/image_read_test.go rename to internal/tools/builtin/image_read_test.go index 3339574c75..b1b83b4892 100644 --- a/internal/tool/builtin/image_read_test.go +++ b/internal/tools/builtin/image_read_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // Telling a model to hexdump a screenshot is telling it to spend a megabyte of diff --git a/internal/tool/builtin/ls.go b/internal/tools/builtin/ls.go similarity index 99% rename from internal/tool/builtin/ls.go rename to internal/tools/builtin/ls.go index 15de075b14..5b34147660 100644 --- a/internal/tool/builtin/ls.go +++ b/internal/tools/builtin/ls.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func init() { tool.RegisterBuiltin(listDir{}) } diff --git a/internal/tool/builtin/main_test.go b/internal/tools/builtin/main_test.go similarity index 100% rename from internal/tool/builtin/main_test.go rename to internal/tools/builtin/main_test.go diff --git a/internal/tool/builtin/managed_config.go b/internal/tools/builtin/managed_config.go similarity index 98% rename from internal/tool/builtin/managed_config.go rename to internal/tools/builtin/managed_config.go index c1f049d1db..ca0fc78bb0 100644 --- a/internal/tool/builtin/managed_config.go +++ b/internal/tools/builtin/managed_config.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // ManagedConfigPaths is the set of Reasonix-owned configuration FILES a file diff --git a/internal/tool/builtin/movefile.go b/internal/tools/builtin/movefile.go similarity index 98% rename from internal/tool/builtin/movefile.go rename to internal/tools/builtin/movefile.go index ae236cd7e3..430b9fa873 100644 --- a/internal/tool/builtin/movefile.go +++ b/internal/tools/builtin/movefile.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/state/sessiontemp" ) func init() { tool.RegisterBuiltin(moveFile{}) } diff --git a/internal/tool/builtin/movefile_other.go b/internal/tools/builtin/movefile_other.go similarity index 100% rename from internal/tool/builtin/movefile_other.go rename to internal/tools/builtin/movefile_other.go diff --git a/internal/tool/builtin/movefile_windows.go b/internal/tools/builtin/movefile_windows.go similarity index 100% rename from internal/tool/builtin/movefile_windows.go rename to internal/tools/builtin/movefile_windows.go diff --git a/internal/tool/builtin/movefile_windows_test.go b/internal/tools/builtin/movefile_windows_test.go similarity index 100% rename from internal/tool/builtin/movefile_windows_test.go rename to internal/tools/builtin/movefile_windows_test.go diff --git a/internal/tool/builtin/multiedit.go b/internal/tools/builtin/multiedit.go similarity index 98% rename from internal/tool/builtin/multiedit.go rename to internal/tools/builtin/multiedit.go index ee7db58cb7..e341fe4227 100644 --- a/internal/tool/builtin/multiedit.go +++ b/internal/tools/builtin/multiedit.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/state/sessiontemp" ) func init() { tool.RegisterBuiltin(multiEdit{}) } diff --git a/internal/tool/builtin/notebookedit.go b/internal/tools/builtin/notebookedit.go similarity index 99% rename from internal/tool/builtin/notebookedit.go rename to internal/tools/builtin/notebookedit.go index cf0a50c909..2e7115f54c 100644 --- a/internal/tool/builtin/notebookedit.go +++ b/internal/tools/builtin/notebookedit.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "reasonix/internal/diff" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/base/diff" + "reasonix/internal/contract/tool" + "reasonix/internal/state/sessiontemp" ) func init() { tool.RegisterBuiltin(notebookEdit{}) } diff --git a/internal/tool/builtin/notebookedit_test.go b/internal/tools/builtin/notebookedit_test.go similarity index 99% rename from internal/tool/builtin/notebookedit_test.go rename to internal/tools/builtin/notebookedit_test.go index 332078873c..2d7f1de903 100644 --- a/internal/tool/builtin/notebookedit_test.go +++ b/internal/tools/builtin/notebookedit_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // sampleNotebook is a minimal but realistic .ipynb: a markdown cell and a code diff --git a/internal/tool/builtin/pathwriter_test.go b/internal/tools/builtin/pathwriter_test.go similarity index 98% rename from internal/tool/builtin/pathwriter_test.go rename to internal/tools/builtin/pathwriter_test.go index 5f6f720a46..6d6272f39a 100644 --- a/internal/tool/builtin/pathwriter_test.go +++ b/internal/tools/builtin/pathwriter_test.go @@ -3,7 +3,7 @@ package builtin import ( "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // pathWriters are the built-ins whose contract is writing the paths their own diff --git a/internal/tool/builtin/pipe_status.go b/internal/tools/builtin/pipe_status.go similarity index 96% rename from internal/tool/builtin/pipe_status.go rename to internal/tools/builtin/pipe_status.go index 397928e066..5c3328d56b 100644 --- a/internal/tool/builtin/pipe_status.go +++ b/internal/tools/builtin/pipe_status.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "reasonix/internal/evidence" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" + "reasonix/internal/safety/sandbox" ) // A pipeline hands the shell only its last stage's status, so `go test | tail` diff --git a/internal/tool/builtin/pipe_status_test.go b/internal/tools/builtin/pipe_status_test.go similarity index 99% rename from internal/tool/builtin/pipe_status_test.go rename to internal/tools/builtin/pipe_status_test.go index 23f234193d..7312f8d081 100644 --- a/internal/tool/builtin/pipe_status_test.go +++ b/internal/tools/builtin/pipe_status_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/sandbox" + "reasonix/internal/safety/sandbox" ) func testProbe(t *testing.T, command string) pipeStatusProbe { diff --git a/internal/tool/builtin/post_write_receipt.go b/internal/tools/builtin/post_write_receipt.go similarity index 100% rename from internal/tool/builtin/post_write_receipt.go rename to internal/tools/builtin/post_write_receipt.go diff --git a/internal/tool/builtin/post_write_receipt_test.go b/internal/tools/builtin/post_write_receipt_test.go similarity index 100% rename from internal/tool/builtin/post_write_receipt_test.go rename to internal/tools/builtin/post_write_receipt_test.go diff --git a/internal/tool/builtin/preview.go b/internal/tools/builtin/preview.go similarity index 99% rename from internal/tool/builtin/preview.go rename to internal/tools/builtin/preview.go index a4b4b857d8..3ab53bd18a 100644 --- a/internal/tool/builtin/preview.go +++ b/internal/tools/builtin/preview.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "reasonix/internal/diff" + "reasonix/internal/base/diff" ) // preview.go gives the file-writing built-ins the optional tool.Previewer diff --git a/internal/tool/builtin/preview_test.go b/internal/tools/builtin/preview_test.go similarity index 98% rename from internal/tool/builtin/preview_test.go rename to internal/tools/builtin/preview_test.go index d3f3d5bc6a..5de0b468ba 100644 --- a/internal/tool/builtin/preview_test.go +++ b/internal/tools/builtin/preview_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "reasonix/internal/diff" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/diff" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" ) // TestWritersImplementPreviewer locks in that every file-writer exposes the diff --git a/internal/tool/builtin/protected_dirs_darwin.go b/internal/tools/builtin/protected_dirs_darwin.go similarity index 100% rename from internal/tool/builtin/protected_dirs_darwin.go rename to internal/tools/builtin/protected_dirs_darwin.go diff --git a/internal/tool/builtin/protected_dirs_darwin_test.go b/internal/tools/builtin/protected_dirs_darwin_test.go similarity index 100% rename from internal/tool/builtin/protected_dirs_darwin_test.go rename to internal/tools/builtin/protected_dirs_darwin_test.go diff --git a/internal/tool/builtin/protected_dirs_other.go b/internal/tools/builtin/protected_dirs_other.go similarity index 100% rename from internal/tool/builtin/protected_dirs_other.go rename to internal/tools/builtin/protected_dirs_other.go diff --git a/internal/tool/builtin/readfile.go b/internal/tools/builtin/readfile.go similarity index 99% rename from internal/tool/builtin/readfile.go rename to internal/tools/builtin/readfile.go index 853e047abe..d10adcf4f3 100644 --- a/internal/tool/builtin/readfile.go +++ b/internal/tools/builtin/readfile.go @@ -15,8 +15,8 @@ import ( "golang.org/x/text/transform" - fileenc "reasonix/internal/fileutil/encoding" - "reasonix/internal/tool" + fileenc "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/tool" ) const ( diff --git a/internal/tool/builtin/readfile_stream_test.go b/internal/tools/builtin/readfile_stream_test.go similarity index 98% rename from internal/tool/builtin/readfile_stream_test.go rename to internal/tools/builtin/readfile_stream_test.go index ba16238b81..4b42b34115 100644 --- a/internal/tool/builtin/readfile_stream_test.go +++ b/internal/tools/builtin/readfile_stream_test.go @@ -10,7 +10,7 @@ import ( "testing" "golang.org/x/text/encoding/simplifiedchinese" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestReadFileStreamsLargeGB18030 proves GB18030 content far past the 256KB diff --git a/internal/tool/builtin/readfile_utf16_test.go b/internal/tools/builtin/readfile_utf16_test.go similarity index 97% rename from internal/tool/builtin/readfile_utf16_test.go rename to internal/tools/builtin/readfile_utf16_test.go index 6ce6626157..5d61201642 100644 --- a/internal/tool/builtin/readfile_utf16_test.go +++ b/internal/tools/builtin/readfile_utf16_test.go @@ -11,7 +11,7 @@ import ( "testing" "unicode/utf16" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestReadFileBOMlessUTF16LE proves a Windows-style UTF-16 source file with no diff --git a/internal/tool/builtin/readfile_window_test.go b/internal/tools/builtin/readfile_window_test.go similarity index 100% rename from internal/tool/builtin/readfile_window_test.go rename to internal/tools/builtin/readfile_window_test.go diff --git a/internal/tool/builtin/recall.go b/internal/tools/builtin/recall.go similarity index 99% rename from internal/tool/builtin/recall.go rename to internal/tools/builtin/recall.go index e1df302750..2e23bf4734 100644 --- a/internal/tool/builtin/recall.go +++ b/internal/tools/builtin/recall.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) const maxRecallPositions = 8 diff --git a/internal/tool/builtin/receipt_hint_test.go b/internal/tools/builtin/receipt_hint_test.go similarity index 100% rename from internal/tool/builtin/receipt_hint_test.go rename to internal/tools/builtin/receipt_hint_test.go diff --git a/internal/tool/builtin/recursive_search_test.go b/internal/tools/builtin/recursive_search_test.go similarity index 98% rename from internal/tool/builtin/recursive_search_test.go rename to internal/tools/builtin/recursive_search_test.go index 6af979cd2b..b331f94afe 100644 --- a/internal/tool/builtin/recursive_search_test.go +++ b/internal/tools/builtin/recursive_search_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestGlobBareNameFallsBackToRecursiveWithWorkDir(t *testing.T) { diff --git a/internal/tool/builtin/schema_budget.json b/internal/tools/builtin/schema_budget.json similarity index 100% rename from internal/tool/builtin/schema_budget.json rename to internal/tools/builtin/schema_budget.json diff --git a/internal/tool/builtin/schema_budget_test.go b/internal/tools/builtin/schema_budget_test.go similarity index 96% rename from internal/tool/builtin/schema_budget_test.go rename to internal/tools/builtin/schema_budget_test.go index ca36dafa1c..f24e0fbe0f 100644 --- a/internal/tool/builtin/schema_budget_test.go +++ b/internal/tools/builtin/schema_budget_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "reasonix/internal/tokencount" - "reasonix/internal/tool" + "reasonix/internal/base/tokencount" + "reasonix/internal/contract/tool" ) // The largest single item in a first request — 3,995 of one measured run's @@ -103,7 +103,7 @@ func TestBuiltinSchemaSurfaceStaysWithinBudget(t *testing.T) { func schemaWidenHint(rows []schemaRow) string { var b strings.Builder - b.WriteString("Trim a description, or run `go test ./internal/tool/builtin -run TestBuiltinSchemaSurface" + + b.WriteString("Trim a description, or run `go test ./internal/tools/builtin -run TestBuiltinSchemaSurface" + " -update-schema-budget -allow-schema-widen` and say why in the pull request:" + " every session pays this before it does anything.\nLargest:") for _, x := range rows[:min(len(rows), 8)] { diff --git a/internal/tool/builtin/sequential_test.go b/internal/tools/builtin/sequential_test.go similarity index 98% rename from internal/tool/builtin/sequential_test.go rename to internal/tools/builtin/sequential_test.go index b413325ba4..030ea129a4 100644 --- a/internal/tool/builtin/sequential_test.go +++ b/internal/tools/builtin/sequential_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // needsItsOwnPlace are the built-ins that touch no file and still cannot share diff --git a/internal/tool/builtin/session_guard.go b/internal/tools/builtin/session_guard.go similarity index 100% rename from internal/tool/builtin/session_guard.go rename to internal/tools/builtin/session_guard.go diff --git a/internal/tool/builtin/session_guard_test.go b/internal/tools/builtin/session_guard_test.go similarity index 99% rename from internal/tool/builtin/session_guard_test.go rename to internal/tools/builtin/session_guard_test.go index 655c8c5dc0..976f7e2ca4 100644 --- a/internal/tool/builtin/session_guard_test.go +++ b/internal/tools/builtin/session_guard_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "reasonix/internal/sandbox" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/safety/sandbox" ) // stateRootFor builds a fake Reasonix state root with the two guarded session diff --git a/internal/tool/builtin/sessiontemp_error.go b/internal/tools/builtin/sessiontemp_error.go similarity index 100% rename from internal/tool/builtin/sessiontemp_error.go rename to internal/tools/builtin/sessiontemp_error.go diff --git a/internal/tool/builtin/step_identity_test.go b/internal/tools/builtin/step_identity_test.go similarity index 99% rename from internal/tool/builtin/step_identity_test.go rename to internal/tools/builtin/step_identity_test.go index 181965aab6..d0b60c1d4a 100644 --- a/internal/tool/builtin/step_identity_test.go +++ b/internal/tools/builtin/step_identity_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "reasonix/internal/evidence" + "reasonix/internal/runtime/evidence" ) func todoWriteArgs(t *testing.T, todos []evidence.TodoItem) json.RawMessage { diff --git a/internal/tool/builtin/systemone.go b/internal/tools/builtin/systemone.go similarity index 97% rename from internal/tool/builtin/systemone.go rename to internal/tools/builtin/systemone.go index 9b3e22380b..96662791ae 100644 --- a/internal/tool/builtin/systemone.go +++ b/internal/tools/builtin/systemone.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "reasonix/internal/laya" - "reasonix/internal/tool" - "reasonix/internal/typesafe" + "reasonix/internal/contract/tool" + "reasonix/internal/model/laya" + "reasonix/internal/safety/typesafe" ) // SystemOneSpec is one decision endpoint plus the local runtime. The endpoint diff --git a/internal/tool/builtin/systemone_test.go b/internal/tools/builtin/systemone_test.go similarity index 99% rename from internal/tool/builtin/systemone_test.go rename to internal/tools/builtin/systemone_test.go index 8ea92927e5..515f303e87 100644 --- a/internal/tool/builtin/systemone_test.go +++ b/internal/tools/builtin/systemone_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/laya" + "reasonix/internal/model/laya" ) func TestSystemOneToolReturnsCompleteDecision(t *testing.T) { diff --git a/internal/tool/builtin/terminal_result_test.go b/internal/tools/builtin/terminal_result_test.go similarity index 98% rename from internal/tool/builtin/terminal_result_test.go rename to internal/tools/builtin/terminal_result_test.go index f32c326805..eecb5318ac 100644 --- a/internal/tool/builtin/terminal_result_test.go +++ b/internal/tools/builtin/terminal_result_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func TestApplyTerminalResultTypedOutcomes(t *testing.T) { diff --git a/internal/tool/builtin/timeout.go b/internal/tools/builtin/timeout.go similarity index 100% rename from internal/tool/builtin/timeout.go rename to internal/tools/builtin/timeout.go diff --git a/internal/tool/builtin/todo.go b/internal/tools/builtin/todo.go similarity index 99% rename from internal/tool/builtin/todo.go rename to internal/tools/builtin/todo.go index bcfd01001c..e8860567f7 100644 --- a/internal/tool/builtin/todo.go +++ b/internal/tools/builtin/todo.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "reasonix/internal/evidence" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func init() { tool.RegisterBuiltin(todoWrite{}) } diff --git a/internal/tool/builtin/todo_test.go b/internal/tools/builtin/todo_test.go similarity index 99% rename from internal/tool/builtin/todo_test.go rename to internal/tools/builtin/todo_test.go index a50afbf29e..849a5a089b 100644 --- a/internal/tool/builtin/todo_test.go +++ b/internal/tools/builtin/todo_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "reasonix/internal/evidence" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/runtime/evidence" ) func TestTodoWriteAcceptsLevels(t *testing.T) { diff --git a/internal/tool/builtin/tool_extra_test.go b/internal/tools/builtin/tool_extra_test.go similarity index 99% rename from internal/tool/builtin/tool_extra_test.go rename to internal/tools/builtin/tool_extra_test.go index dedc1fcbc0..bce2cae877 100644 --- a/internal/tool/builtin/tool_extra_test.go +++ b/internal/tools/builtin/tool_extra_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // read_file extended tests diff --git a/internal/tool/builtin/updategoal.go b/internal/tools/builtin/updategoal.go similarity index 99% rename from internal/tool/builtin/updategoal.go rename to internal/tools/builtin/updategoal.go index 68ec9a5802..372665daee 100644 --- a/internal/tool/builtin/updategoal.go +++ b/internal/tools/builtin/updategoal.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) func init() { tool.RegisterBuiltin(updateGoal{}) } diff --git a/internal/tool/builtin/updategoal_test.go b/internal/tools/builtin/updategoal_test.go similarity index 99% rename from internal/tool/builtin/updategoal_test.go rename to internal/tools/builtin/updategoal_test.go index d21779359f..34706294d0 100644 --- a/internal/tool/builtin/updategoal_test.go +++ b/internal/tools/builtin/updategoal_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" ) // recordingRecorder is a minimal GoalTurnRecorder for tool-level tests. diff --git a/internal/tool/builtin/vendorskip_test.go b/internal/tools/builtin/vendorskip_test.go similarity index 97% rename from internal/tool/builtin/vendorskip_test.go rename to internal/tools/builtin/vendorskip_test.go index 4d216eedb4..860c019251 100644 --- a/internal/tool/builtin/vendorskip_test.go +++ b/internal/tools/builtin/vendorskip_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func mkfile(t *testing.T, path, content string) { diff --git a/internal/tool/builtin/walk_cancel_test.go b/internal/tools/builtin/walk_cancel_test.go similarity index 98% rename from internal/tool/builtin/walk_cancel_test.go rename to internal/tools/builtin/walk_cancel_test.go index 2ef0f9a3b6..c2855e3417 100644 --- a/internal/tool/builtin/walk_cancel_test.go +++ b/internal/tools/builtin/walk_cancel_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // TestGrepWalkInterruptible proves the native (no-ripgrep) grep walk aborts on a diff --git a/internal/tool/builtin/web_fetch_proxy_test.go b/internal/tools/builtin/web_fetch_proxy_test.go similarity index 99% rename from internal/tool/builtin/web_fetch_proxy_test.go rename to internal/tools/builtin/web_fetch_proxy_test.go index 3744e02375..70dac5cd79 100644 --- a/internal/tool/builtin/web_fetch_proxy_test.go +++ b/internal/tools/builtin/web_fetch_proxy_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "reasonix/internal/netclient" + "reasonix/internal/base/netclient" ) func startCONNECTProxy(t *testing.T) string { diff --git a/internal/tool/builtin/webfetch.go b/internal/tools/builtin/webfetch.go similarity index 99% rename from internal/tool/builtin/webfetch.go rename to internal/tools/builtin/webfetch.go index 2309995ce1..957abea20a 100644 --- a/internal/tool/builtin/webfetch.go +++ b/internal/tools/builtin/webfetch.go @@ -19,8 +19,8 @@ import ( nethtml "golang.org/x/net/html" "golang.org/x/net/proxy" - "reasonix/internal/netclient" - "reasonix/internal/tool" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/tool" ) func init() { tool.RegisterBuiltin(webFetch{}) } diff --git a/internal/tool/builtin/webfetch_ssrf_test.go b/internal/tools/builtin/webfetch_ssrf_test.go similarity index 100% rename from internal/tool/builtin/webfetch_ssrf_test.go rename to internal/tools/builtin/webfetch_ssrf_test.go diff --git a/internal/tool/builtin/workspace.go b/internal/tools/builtin/workspace.go similarity index 98% rename from internal/tool/builtin/workspace.go rename to internal/tools/builtin/workspace.go index ab09c29bea..a1e4760bd5 100644 --- a/internal/tool/builtin/workspace.go +++ b/internal/tools/builtin/workspace.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "reasonix/internal/netclient" - "reasonix/internal/sandbox" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + "reasonix/internal/base/netclient" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" + "reasonix/internal/state/sessiontemp" ) // Workspace builds a built-in tool set bound to a working directory, so several diff --git a/internal/tool/builtin/workspace_test.go b/internal/tools/builtin/workspace_test.go similarity index 99% rename from internal/tool/builtin/workspace_test.go rename to internal/tools/builtin/workspace_test.go index bebe28d9ae..571b4beb0e 100644 --- a/internal/tool/builtin/workspace_test.go +++ b/internal/tools/builtin/workspace_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "reasonix/internal/sessiontemp" - "reasonix/internal/testenv" - "reasonix/internal/tool" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/tool" + "reasonix/internal/state/sessiontemp" ) func TestResolveIn(t *testing.T) { diff --git a/internal/tool/builtin/write_tool_test.go b/internal/tools/builtin/write_tool_test.go similarity index 99% rename from internal/tool/builtin/write_tool_test.go rename to internal/tools/builtin/write_tool_test.go index 9e2f2f2074..d13fdedb8c 100644 --- a/internal/tool/builtin/write_tool_test.go +++ b/internal/tools/builtin/write_tool_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // write_file extended tests diff --git a/internal/tool/builtin/writefile.go b/internal/tools/builtin/writefile.go similarity index 97% rename from internal/tool/builtin/writefile.go rename to internal/tools/builtin/writefile.go index bfbdb73843..4b804ba0a4 100644 --- a/internal/tool/builtin/writefile.go +++ b/internal/tools/builtin/writefile.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - fileenc "reasonix/internal/fileutil/encoding" - "reasonix/internal/sessiontemp" - "reasonix/internal/tool" + fileenc "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/tool" + "reasonix/internal/state/sessiontemp" ) func init() { tool.RegisterBuiltin(writeFile{}) } diff --git a/internal/productdocs/docs.go b/internal/tools/productdocs/docs.go similarity index 99% rename from internal/productdocs/docs.go rename to internal/tools/productdocs/docs.go index 3196b1548d..3d21d51509 100644 --- a/internal/productdocs/docs.go +++ b/internal/tools/productdocs/docs.go @@ -26,8 +26,8 @@ import ( goldmarktext "github.com/yuin/goldmark/text" productcontent "reasonix/docs" - "reasonix/internal/retrieval" - "reasonix/internal/tool" + "reasonix/internal/base/retrieval" + "reasonix/internal/contract/tool" ) const ( diff --git a/internal/productdocs/docs_test.go b/internal/tools/productdocs/docs_test.go similarity index 99% rename from internal/productdocs/docs_test.go rename to internal/tools/productdocs/docs_test.go index c8ecf01bb8..754847c0f2 100644 --- a/internal/productdocs/docs_test.go +++ b/internal/tools/productdocs/docs_test.go @@ -11,7 +11,7 @@ import ( "testing/fstest" productcontent "reasonix/docs" - "reasonix/internal/provider" + "reasonix/internal/contract/provider" ) func TestEmbeddedCatalogLoadsDeterministically(t *testing.T) { diff --git a/internal/productdocs/metadata.go b/internal/tools/productdocs/metadata.go similarity index 100% rename from internal/productdocs/metadata.go rename to internal/tools/productdocs/metadata.go diff --git a/internal/tool/sessiontool/sessiontool.go b/internal/tools/sessiontool/sessiontool.go similarity index 98% rename from internal/tool/sessiontool/sessiontool.go rename to internal/tools/sessiontool/sessiontool.go index 6f44623e7d..8453c1c8ac 100644 --- a/internal/tool/sessiontool/sessiontool.go +++ b/internal/tools/sessiontool/sessiontool.go @@ -12,9 +12,9 @@ import ( "path/filepath" "strings" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/textutil" + "reasonix/internal/base/textutil" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // list_sessions tool diff --git a/internal/tool/sessiontool/sessiontool_test.go b/internal/tools/sessiontool/sessiontool_test.go similarity index 99% rename from internal/tool/sessiontool/sessiontool_test.go rename to internal/tools/sessiontool/sessiontool_test.go index 646911cb6a..7bee6875fb 100644 --- a/internal/tool/sessiontool/sessiontool_test.go +++ b/internal/tools/sessiontool/sessiontool_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "reasonix/internal/agent" - "reasonix/internal/provider" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" + "reasonix/internal/contract/provider" + "reasonix/internal/runtime/agent" ) // writeSessionJSONL writes provider.Messages as JSONL to a file, matching diff --git a/internal/shellrun/decode.go b/internal/tools/shellrun/decode.go similarity index 94% rename from internal/shellrun/decode.go rename to internal/tools/shellrun/decode.go index 78dc6fa731..f3a25164d9 100644 --- a/internal/shellrun/decode.go +++ b/internal/tools/shellrun/decode.go @@ -3,7 +3,7 @@ package shellrun import ( "unicode/utf8" - fileenc "reasonix/internal/fileutil/encoding" + fileenc "reasonix/internal/base/fileutil/encoding" ) // decodeShellOutput reads a child's bytes as text. A Windows console tool diff --git a/internal/shellrun/decode_test.go b/internal/tools/shellrun/decode_test.go similarity index 100% rename from internal/shellrun/decode_test.go rename to internal/tools/shellrun/decode_test.go diff --git a/internal/shellrun/descriptor.go b/internal/tools/shellrun/descriptor.go similarity index 96% rename from internal/shellrun/descriptor.go rename to internal/tools/shellrun/descriptor.go index 0389463a0f..e3a0c1e438 100644 --- a/internal/shellrun/descriptor.go +++ b/internal/tools/shellrun/descriptor.go @@ -5,8 +5,8 @@ import ( "runtime" "strings" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" ) // DescriptorFromShell builds a partial ShellExecution from a resolved sandbox diff --git a/internal/shellrun/progress_suppress_test.go b/internal/tools/shellrun/progress_suppress_test.go similarity index 100% rename from internal/shellrun/progress_suppress_test.go rename to internal/tools/shellrun/progress_suppress_test.go diff --git a/internal/shellrun/runner.go b/internal/tools/shellrun/runner.go similarity index 99% rename from internal/shellrun/runner.go rename to internal/tools/shellrun/runner.go index f973eade4b..22e8d0d66a 100644 --- a/internal/shellrun/runner.go +++ b/internal/tools/shellrun/runner.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "reasonix/internal/proc" - "reasonix/internal/tool" + "reasonix/internal/base/proc" + "reasonix/internal/contract/tool" ) // DefaultWaitDelay mirrors the bash tool's child-process wait grace. diff --git a/internal/shellrun/runner_test.go b/internal/tools/shellrun/runner_test.go similarity index 99% rename from internal/shellrun/runner_test.go rename to internal/tools/shellrun/runner_test.go index 921166c84b..95ba2e3247 100644 --- a/internal/shellrun/runner_test.go +++ b/internal/tools/shellrun/runner_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "reasonix/internal/proc" - "reasonix/internal/sandbox" - "reasonix/internal/tool" + "reasonix/internal/base/proc" + "reasonix/internal/contract/tool" + "reasonix/internal/safety/sandbox" ) func TestDescriptorFromShell(t *testing.T) { diff --git a/internal/shellrun/subject.go b/internal/tools/shellrun/subject.go similarity index 97% rename from internal/shellrun/subject.go rename to internal/tools/shellrun/subject.go index 40048b60da..4b3554330f 100644 --- a/internal/shellrun/subject.go +++ b/internal/tools/shellrun/subject.go @@ -5,7 +5,7 @@ import ( "mvdan.cc/sh/v3/syntax" - "reasonix/internal/shellparse" + "reasonix/internal/base/shellparse" ) // OperativeCommand returns command with its leading environment assignments diff --git a/internal/shellrun/subject_test.go b/internal/tools/shellrun/subject_test.go similarity index 94% rename from internal/shellrun/subject_test.go rename to internal/tools/shellrun/subject_test.go index e16fe7b63b..ce52ab6636 100644 --- a/internal/shellrun/subject_test.go +++ b/internal/tools/shellrun/subject_test.go @@ -14,8 +14,8 @@ func TestOperativeCommand(t *testing.T) { {"several", "GOOS=linux GOARCH=arm64 go build ./cmd/reasonix", "go build ./cmd/reasonix", true}, { "substitution holding a pipeline", - "PATH=$(echo $PATH | tr ':' '\\n' | grep -v emsdk | paste -sd: -) go test ./internal/agent/", - "go test ./internal/agent/", + "PATH=$(echo $PATH | tr ':' '\\n' | grep -v emsdk | paste -sd: -) go test ./internal/runtime/agent/", + "go test ./internal/runtime/agent/", true, }, {"quoting survives", `MSG="a b" printf '%s\n' "$MSG"`, `printf '%s\n' "$MSG"`, true}, diff --git a/npm/build.mjs b/npm/build.mjs index 40ea181bea..ba80f43611 100644 --- a/npm/build.mjs +++ b/npm/build.mjs @@ -51,7 +51,7 @@ for (const t of TARGETS) { "build", "-trimpath", "-ldflags", - `-s -w -X main.version=${binaryVersion} -X main.gitCommit=${gitCommit} -X main.buildTimeUTC=${buildTimeUTC} -X reasonix/internal/productdocs.linkedVersion=${binaryVersion} -X reasonix/internal/productdocs.linkedRevision=${candidateSha}`, + `-s -w -X main.version=${binaryVersion} -X main.gitCommit=${gitCommit} -X main.buildTimeUTC=${buildTimeUTC} -X reasonix/internal/tools/productdocs.linkedVersion=${binaryVersion} -X reasonix/internal/tools/productdocs.linkedRevision=${candidateSha}`, "-o", join(dir, "bin", exe), "./cmd/reasonix", diff --git a/reasonix.example.toml b/reasonix.example.toml index 298e7d82e6..e486a04112 100644 --- a/reasonix.example.toml +++ b/reasonix.example.toml @@ -115,7 +115,7 @@ effort = "high" # Anthropic (Claude) — the "anthropic" kind speaks the Messages API directly (no # OpenAI shim). base_url is optional (defaults to https://api.anthropic.com). Note: # this provider does not enable extended thinking and does not send temperature — -# current Claude models reject sampling params (see internal/provider/anthropic). +# current Claude models reject sampling params (see internal/model/anthropic). # Some Anthropic-compatible gateways use Bearer auth instead of x-api-key; set # auth_header = true for those (for example MiniMax Global or Vercel AI Gateway). [[providers]] diff --git a/scripts/cache-guard.sh b/scripts/cache-guard.sh index 7b794b142c..e860a7571a 100755 --- a/scripts/cache-guard.sh +++ b/scripts/cache-guard.sh @@ -5,7 +5,7 @@ tmp=$(mktemp) trap 'rm -f "$tmp"' EXIT set +e -REASONIX_RELEASE_CACHE_GUARD=1 go test ./internal/agent -run '^TestReleaseCacheHitGuard$' -v -count=1 2>&1 | tee "$tmp" +REASONIX_RELEASE_CACHE_GUARD=1 go test ./internal/runtime/agent -run '^TestReleaseCacheHitGuard$' -v -count=1 2>&1 | tee "$tmp" status=${PIPESTATUS[0]} set -e @@ -16,7 +16,7 @@ fi # A deterministic enabled extension may intentionally establish a different # prefix once, but independent reload generations must reproduce identical # provider-visible prompt and tool-schema bytes. -go test ./internal/boot -run '^TestBootStableExtensionCacheGuard$' -v -count=1 +go test ./internal/assembly/boot -run '^TestBootStableExtensionCacheGuard$' -v -count=1 if [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then { diff --git a/scripts/credential-leak-check.mjs b/scripts/credential-leak-check.mjs index 894b5f5d10..5d2d3df794 100644 --- a/scripts/credential-leak-check.mjs +++ b/scripts/credential-leak-check.mjs @@ -16,7 +16,7 @@ import { readFileSync, readdirSync, statSync } from "node:fs"; import { join } from "node:path"; import { createHash } from "node:crypto"; -const PKG = process.argv[2] ?? "./internal/config/"; +const PKG = process.argv[2] ?? "./internal/contract/config/"; // Anything shaped like a provider token. Deliberately loose: a false positive // costs one look at the fixtures, a false negative costs a leaked key. diff --git a/scripts/verify-embedded-docs.sh b/scripts/verify-embedded-docs.sh index 8d019cdfc1..26beb04945 100755 --- a/scripts/verify-embedded-docs.sh +++ b/scripts/verify-embedded-docs.sh @@ -39,7 +39,7 @@ trap cleanup EXIT binary="$tmp_dir/reasonix" build_time_utc="$(date -u +%Y-%m-%dT%H:%M:%SZ)" git_commit="$(printf '%s' "$revision" | cut -c1-12)" -ldflags="-s -w -X main.version=$version -X main.gitCommit=$git_commit -X main.buildTimeUTC=$build_time_utc -X reasonix/internal/productdocs.linkedVersion=$version -X reasonix/internal/productdocs.linkedRevision=$revision" +ldflags="-s -w -X main.version=$version -X main.gitCommit=$git_commit -X main.buildTimeUTC=$build_time_utc -X reasonix/internal/tools/productdocs.linkedVersion=$version -X reasonix/internal/tools/productdocs.linkedRevision=$revision" ( cd "$repo_root" CGO_ENABLED=0 go build -trimpath -ldflags="$ldflags" -o "$binary" ./cmd/reasonix diff --git a/sdk/go/README.md b/sdk/go/README.md index bd8d2db06f..343636f529 100644 --- a/sdk/go/README.md +++ b/sdk/go/README.md @@ -106,7 +106,7 @@ The resulting directory is a complete Manifest v2 plugin package. The binary speaks the protocol on stdin/stdout, so install the directory as a plugin package (or point the host-side conformance suite at it) rather than running the binary interactively. It is installed into a temporary Reasonix home and -driven end-to-end against the real host by `internal/extension/conformance` in +driven end-to-end against the real host by `internal/ext/extension/conformance` in the Reasonix repository. ## Generated wire types @@ -119,7 +119,7 @@ constructors, enum helpers) lives in `types_ext.go`. ## Protocol reference - Method/DTO contract: [`docs/EXTENSION_PROTOCOL.generated.md`](../../docs/EXTENSION_PROTOCOL.generated.md) -- Canonical JSON schema: [`internal/extension/protocol/schema.generated.json`](../../internal/extension/protocol/schema.generated.json) +- Canonical JSON schema: [`internal/ext/extension/protocol/schema.generated.json`](../../internal/ext/extension/protocol/schema.generated.json) - Transport: strict JSON-RPC 2.0 over NDJSON (one object per line), integer request ids, object params, 8 MiB frames. diff --git a/sdk/go/examples/fullsidecar/main.go b/sdk/go/examples/fullsidecar/main.go index 7055acaab7..7882b13478 100644 --- a/sdk/go/examples/fullsidecar/main.go +++ b/sdk/go/examples/fullsidecar/main.go @@ -25,7 +25,7 @@ // pacing between provider chunks (default 15) // // The two hooks below exist for the host↔SDK conformance suite -// (internal/extension/conformance); they are inert unless set: +// (internal/ext/extension/conformance); they are inert unless set: // // FULLSIDECAR_CRASH_ON_INPUT exit(3) without answering when an // input.receive text matches exactly diff --git a/sdk/go/sdk.go b/sdk/go/sdk.go index 89913ccd14..697daefc97 100644 --- a/sdk/go/sdk.go +++ b/sdk/go/sdk.go @@ -16,7 +16,7 @@ // should exit with code 0; the host reaps it by that exit status. // // Protocol reference: docs/EXTENSION_PROTOCOL.generated.md and -// internal/extension/protocol/schema.generated.json in the Reasonix +// internal/ext/extension/protocol/schema.generated.json in the Reasonix // repository. package extension diff --git a/sdk/go/types_ext.go b/sdk/go/types_ext.go index 2d00f87a55..74924b0b19 100644 --- a/sdk/go/types_ext.go +++ b/sdk/go/types_ext.go @@ -11,7 +11,7 @@ import ( // generator cannot emit (validators, error constructors, enum helpers). The // wire DTOs, enums, method names, frozen limits, and the frozen error table // live in types_generated.go, mirrored from the host's -// internal/extension/protocol package by cmd/extension-protocol-gen. +// internal/ext/extension/protocol package by cmd/extension-protocol-gen. // // Stability contract (mirrored from the host): within major version 1 only // optional fields, new enum values, and new methods may be added. Existing diff --git a/sdk/go/types_generated.go b/sdk/go/types_generated.go index 4e0467bff9..24c49d7541 100644 --- a/sdk/go/types_generated.go +++ b/sdk/go/types_generated.go @@ -2,7 +2,7 @@ // Package extension: Extension Protocol v2 wire DTOs, enums, method // names, frozen limits, and the frozen error table, mirrored from the -// host's internal/extension/protocol package. Behavior (validators, +// host's internal/ext/extension/protocol package. Behavior (validators, // error constructors, helpers) lives in the handwritten files. package extension diff --git a/tools/covergate/baseline.json b/tools/covergate/baseline.json index 650fcf3eb6..38102ecbeb 100644 --- a/tools/covergate/baseline.json +++ b/tools/covergate/baseline.json @@ -1,17 +1,17 @@ { - "internal/browser/**": 21.7, - "internal/computer/**": 89.8, - "internal/control/approval.go": 94.3, - "internal/control/approval_bridge.go": 77, - "internal/control/approval_orchestration.go": 90.7, - "internal/installsource/**": 77.2, - "internal/netclient/**": 47.2, - "internal/permission/**": 90.2, - "internal/plugin/**": 77.4, - "internal/pluginpkg/**": 82.7, - "internal/providerbroker/**": 83.1, - "internal/redirectguard/**": 92.6, - "internal/sandbox/**": 78.1, - "internal/shellparse/**": 64.5, - "internal/shellsafe/**": 81.6 + "internal/platform/browser/**": 21.7, + "internal/platform/computer/**": 89.8, + "internal/session/control/approval.go": 94.3, + "internal/session/control/approval_bridge.go": 77, + "internal/session/control/approval_orchestration.go": 90.7, + "internal/ext/installsource/**": 77.2, + "internal/base/netclient/**": 47.2, + "internal/safety/permission/**": 90.2, + "internal/ext/plugin/**": 77.4, + "internal/ext/pluginpkg/**": 82.7, + "internal/model/providerbroker/**": 83.1, + "internal/safety/redirectguard/**": 92.6, + "internal/safety/sandbox/**": 78.1, + "internal/base/shellparse/**": 64.5, + "internal/safety/shellsafe/**": 81.6 } diff --git a/tools/covergate/main.go b/tools/covergate/main.go index 4ff5c17581..6fdddce7e3 100644 --- a/tools/covergate/main.go +++ b/tools/covergate/main.go @@ -19,7 +19,7 @@ import ( "strconv" "strings" - "reasonix/internal/instruction" + "reasonix/internal/state/instruction" ) func main() { diff --git a/tools/covergate/main_test.go b/tools/covergate/main_test.go index 82f3adfcd2..8d80281681 100644 --- a/tools/covergate/main_test.go +++ b/tools/covergate/main_test.go @@ -7,16 +7,16 @@ import ( "strings" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) func TestPackagesForMapsGlobsOntoPackages(t *testing.T) { got := packagesFor([]string{ - "internal/permission/**", - "internal/control/approval.go", - "internal/permission/**", + "internal/safety/permission/**", + "internal/session/control/approval.go", + "internal/safety/permission/**", }) - want := []string{"./internal/control/...", "./internal/permission/..."} + want := []string{"./internal/safety/permission/...", "./internal/session/control/..."} if !reflect.DeepEqual(got, want) { t.Fatalf("packagesFor = %v, want %v", got, want) } @@ -35,10 +35,10 @@ func TestMatchesGlobHandlesSubtreesAndExactFiles(t *testing.T) { glob, file string want bool }{ - {"internal/permission/**", "internal/permission/rule.go", true}, - {"internal/permission/**", "internal/permissionx/rule.go", false}, - {"internal/control/approval.go", "internal/control/approval.go", true}, - {"internal/control/approval.go", "internal/control/controller.go", false}, + {"internal/safety/permission/**", "internal/safety/permission/rule.go", true}, + {"internal/safety/permission/**", "internal/permissionx/rule.go", false}, + {"internal/session/control/approval.go", "internal/session/control/approval.go", true}, + {"internal/session/control/approval.go", "internal/session/control/controller.go", false}, } { if got := matchesGlob(tc.glob, tc.file); got != tc.want { t.Errorf("matchesGlob(%q, %q) = %v, want %v", tc.glob, tc.file, got, tc.want) @@ -52,22 +52,22 @@ func TestFromProfileAggregatesPerDeclaredPath(t *testing.T) { dir := testenv.TempDir(t) profile := filepath.Join(dir, "c.out") body := "mode: set\n" + - "reasonix/internal/control/approval.go:1.1,2.2 4 1\n" + - "reasonix/internal/control/approval.go:3.1,4.2 4 0\n" + - "reasonix/internal/control/controller.go:1.1,2.2 100 0\n" + - "reasonix/internal/permission/rule.go:1.1,2.2 3 1\n" + "reasonix/internal/session/control/approval.go:1.1,2.2 4 1\n" + + "reasonix/internal/session/control/approval.go:3.1,4.2 4 0\n" + + "reasonix/internal/session/control/controller.go:1.1,2.2 100 0\n" + + "reasonix/internal/safety/permission/rule.go:1.1,2.2 3 1\n" if err := os.WriteFile(profile, []byte(body), 0o600); err != nil { t.Fatal(err) } - got, _, err := fromProfile(profile, []string{"internal/control/approval.go", "internal/permission/**"}) + got, _, err := fromProfile(profile, []string{"internal/session/control/approval.go", "internal/safety/permission/**"}) if err != nil { t.Fatal(err) } - if got["internal/control/approval.go"] != 50.0 { - t.Errorf("approval.go = %v, want 50 (the file, not its package)", got["internal/control/approval.go"]) + if got["internal/session/control/approval.go"] != 50.0 { + t.Errorf("approval.go = %v, want 50 (the file, not its package)", got["internal/session/control/approval.go"]) } - if got["internal/permission/**"] != 100.0 { - t.Errorf("permission = %v, want 100", got["internal/permission/**"]) + if got["internal/safety/permission/**"] != 100.0 { + t.Errorf("permission = %v, want 100", got["internal/safety/permission/**"]) } } @@ -120,7 +120,7 @@ func TestSensitiveGlobsComeFromTheProjectHostChecks(t *testing.T) { } found := false for _, g := range globs { - if g == "internal/shellsafe/**" { + if g == "internal/safety/shellsafe/**" { found = true } } diff --git a/tools/pricecheck/main.go b/tools/pricecheck/main.go index 4d30060e57..f59fcc7739 100644 --- a/tools/pricecheck/main.go +++ b/tools/pricecheck/main.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "reasonix/internal/billing" + "reasonix/internal/model/billing" ) type verdict string diff --git a/tools/pricecheck/main_test.go b/tools/pricecheck/main_test.go index 64b1be0959..575e2fb7b1 100644 --- a/tools/pricecheck/main_test.go +++ b/tools/pricecheck/main_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "reasonix/internal/billing" + "reasonix/internal/model/billing" ) func tableFrom(t *testing.T, path string) table { diff --git a/tools/pricecheck/sources.go b/tools/pricecheck/sources.go index 542f768f6b..13954c0a70 100644 --- a/tools/pricecheck/sources.go +++ b/tools/pricecheck/sources.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "reasonix/internal/billing" + "reasonix/internal/model/billing" ) // published is one rate a vendor's page states for a model. diff --git a/tools/repolint/baseline.json b/tools/repolint/baseline.json index a0f4d90e4a..78062a7244 100644 --- a/tools/repolint/baseline.json +++ b/tools/repolint/baseline.json @@ -15,6 +15,7 @@ "flat-view": 0, "frontend-parity": 32, "function-size": 4348, + "layer-order": 47, "layering": 0, "marker": 0, "narrative": 0, @@ -211,1373 +212,1466 @@ "doc-owner": 1, "doc-prose": 2 }, - "internal/acp/clientio.go": { - "essay": 4 - }, - "internal/acp/dispatch.go": { - "essay": 16 - }, - "internal/acp/dispatch_extension_test.go": { - "essay": 1 - }, - "internal/acp/e2e_test.go": { - "essay": 2 - }, - "internal/acp/extension_models.go": { - "essay": 2 - }, - "internal/acp/live_test.go": { - "essay": 1 - }, - "internal/acp/protocol.go": { - "essay": 13, - "file-size": 26 - }, - "internal/acp/server.go": { - "essay": 4 - }, - "internal/acp/server_test.go": { - "essay": 1 - }, - "internal/acp/service.go": { - "essay": 49, - "file-size": 876, - "function-size": 97, - "struct-state": 2 - }, - "internal/acp/service_lock_test.go": { - "essay": 7 - }, - "internal/acp/session.go": { - "essay": 6 - }, - "internal/acp/session_config.go": { - "essay": 6 - }, - "internal/acp/status.go": { - "file-size": 20 - }, - "internal/acp/switch_recovery_test.go": { - "essay": 7 - }, - "internal/agent/agent.go": { - "complexity": 37, - "essay": 33, - "file-size": 1223, - "function-size": 102 - }, - "internal/agent/agent_options.go": { - "essay": 10 - }, - "internal/agent/ask.go": { - "essay": 1 - }, - "internal/agent/branch.go": { - "essay": 10, - "orphan": 3 - }, - "internal/agent/cache_shape.go": { - "essay": 3 - }, - "internal/agent/cache_shape_test.go": { - "essay": 1 - }, - "internal/agent/capability_gate.go": { - "essay": 7 - }, - "internal/agent/capability_gate_test.go": { - "essay": 1 - }, - "internal/agent/compact_test.go": { - "essay": 1 - }, - "internal/agent/context_manager.go": { - "essay": 1 - }, - "internal/agent/coordinator.go": { - "essay": 14, - "orphan": 1 - }, - "internal/agent/coordinator_test.go": { - "essay": 3 - }, - "internal/agent/delivery_hardening_test.go": { - "essay": 3 - }, - "internal/agent/delivery_scope_test.go": { - "essay": 1 - }, - "internal/agent/dependent_writer_preview_test.go": { - "essay": 1 - }, - "internal/agent/empty_final_test.go": { - "essay": 5 - }, - "internal/agent/execute_batch.go": { - "complexity": 22, - "function-size": 108 - }, - "internal/agent/execute_one.go": { - "essay": 14 - }, - "internal/agent/extensions.go": { - "essay": 64 - }, - "internal/agent/extensions_test.go": { - "essay": 4 - }, - "internal/agent/final_readiness.go": { - "complexity": 1 - }, - "internal/agent/fleet.go": { - "essay": 3 - }, - "internal/agent/format.go": { - "orphan": 1 - }, - "internal/agent/listsessions_bench_test.go": { - "essay": 4 - }, - "internal/agent/migrate.go": { - "complexity": 32, - "essay": 23, - "file-size": 195, - "function-size": 73 - }, - "internal/agent/normalize.go": { - "essay": 14 - }, - "internal/agent/parallel_tasks.go": { - "essay": 3, - "function-size": 71 - }, - "internal/agent/parallel_tasks_test.go": { - "essay": 2 - }, - "internal/agent/preview.go": { - "essay": 17 - }, - "internal/agent/preview_test.go": { - "essay": 3 - }, - "internal/agent/profile_spec.go": { - "essay": 4 - }, - "internal/agent/reasoning_language.go": { - "essay": 2 - }, - "internal/agent/reasoning_warn_state.go": { - "complexity": 2, - "essay": 14 - }, - "internal/agent/recovery_gate.go": { - "essay": 8 - }, - "internal/agent/recovery_gc.go": { - "essay": 17 - }, - "internal/agent/recovery_gc_test.go": { - "essay": 1 - }, - "internal/agent/review_unavailable.go": { - "orphan": 1 - }, - "internal/agent/run_loop.go": { - "essay": 21, - "function-size": 2 - }, - "internal/agent/run_usage.go": { - "complexity": 1, - "essay": 5 - }, - "internal/agent/save.go": { - "complexity": 36, - "essay": 109, - "file-size": 1281, - "function-size": 95 - }, - "internal/agent/save_test.go": { - "essay": 9 - }, - "internal/agent/scheduler.go": { - "essay": 1 - }, - "internal/agent/session.go": { - "essay": 28 - }, - "internal/agent/session_compat_legacy_test.go": { - "essay": 3 - }, - "internal/agent/session_content.go": { - "orphan": 1 - }, - "internal/agent/session_display_index.go": { - "essay": 18, - "orphan": 2 - }, - "internal/agent/session_display_read_model.go": { - "orphan": 2 - }, - "internal/agent/session_events.go": { - "essay": 9, - "file-size": 82 - }, - "internal/agent/session_events_test.go": { - "essay": 3 - }, - "internal/agent/session_lease.go": { - "essay": 13 - }, - "internal/agent/session_lease_test.go": { - "essay": 4 - }, - "internal/agent/session_lock_windows.go": { - "essay": 4 - }, - "internal/agent/session_removal.go": { - "essay": 6 - }, - "internal/agent/steer_flush_test.go": { - "essay": 1 - }, - "internal/agent/subagent_progress.go": { - "essay": 10 - }, - "internal/agent/subagent_store.go": { - "essay": 5, - "file-size": 127 - }, - "internal/agent/task.go": { - "complexity": 12, - "essay": 35, - "file-size": 1121, - "function-size": 94, - "orphan": 1 - }, - "internal/agent/task_test.go": { - "essay": 4 - }, - "internal/agent/testutil/mock_provider.go": { - "essay": 10 - }, - "internal/agent/textsink.go": { - "essay": 9 - }, - "internal/agent/usecapability.go": { - "essay": 9, - "file-size": 713, - "function-size": 2 - }, - "internal/agent/width.go": { - "essay": 1 - }, - "internal/agent/write_claims.go": { - "orphan": 1 - }, - "internal/billing/migrate.go": { - "orphan": 1 - }, - "internal/boot/boot.go": { + "internal/assembly/boot/boot.go": { "complexity": 125, "essay": 76, "file-size": 897, "function-size": 1013 }, - "internal/boot/boot_test.go": { + "internal/assembly/boot/boot_test.go": { "essay": 10 }, - "internal/boot/extension_dispatch_test.go": { + "internal/assembly/boot/extension_dispatch_test.go": { "essay": 3 }, - "internal/boot/extension_firstboot_test.go": { + "internal/assembly/boot/extension_firstboot_test.go": { "essay": 1 }, - "internal/boot/extension_sidecar_test.go": { + "internal/assembly/boot/extension_sidecar_test.go": { "essay": 28 }, - "internal/boot/extension_ui_gate_test.go": { + "internal/assembly/boot/extension_ui_gate_test.go": { "essay": 1 }, - "internal/boot/golden_baseline_test.go": { + "internal/assembly/boot/golden_baseline_test.go": { "essay": 17 }, - "internal/boot/model_error_test.go": { + "internal/assembly/boot/model_error_test.go": { "essay": 2 }, - "internal/boot/prompt_stability_test.go": { + "internal/assembly/boot/prompt_stability_test.go": { "essay": 4 }, - "internal/boot/rebuild_subgraph.go": { + "internal/assembly/boot/rebuild_subgraph.go": { "function-size": 7 }, - "internal/boot/reload.go": { + "internal/assembly/boot/reload.go": { "essay": 32 }, - "internal/boot/runtime.go": { + "internal/assembly/boot/runtime.go": { "essay": 50, "function-size": 1 }, - "internal/boot/token_profile.go": { + "internal/assembly/boot/token_profile.go": { "essay": 1 }, - "internal/capability/audit.go": { - "struct-state": 6 - }, - "internal/capability/catalog.go": { + "internal/base/fileref/search.go": { "essay": 1 }, - "internal/capdiag/collect.go": { - "essay": 1 - }, - "internal/capdiag/render.go": { - "orphan": 1 - }, - "internal/checkpoint/barrier.go": { - "essay": 1 - }, - "internal/checkpoint/checkpoint.go": { - "essay": 8, - "file-size": 291 - }, - "internal/checkpoint/observer.go": { - "essay": 1 - }, - "internal/checkpoint/transaction.go": { - "complexity": 24, - "essay": 2, - "file-size": 739, - "function-size": 73 - }, - "internal/cli/acp.go": { - "essay": 7, - "function-size": 31 - }, - "internal/cli/buildinfo.go": { - "essay": 7 - }, - "internal/cli/cli.go": { - "complexity": 32, - "essay": 41, - "file-size": 1079, - "function-size": 167 - }, - "internal/cli/cli_test.go": { - "essay": 9 - }, - "internal/cli/default_model.go": { - "essay": 12 - }, - "internal/cli/extension_surface.go": { - "essay": 4 - }, - "internal/cli/hook_machine.go": { - "essay": 3 - }, - "internal/cli/mathnode.go": { - "essay": 1 - }, - "internal/cli/mcp.go": { - "essay": 1 - }, - "internal/cli/md.go": { - "essay": 7 - }, - "internal/cli/remote_connect.go": { - "essay": 3 - }, - "internal/cli/review.go": { - "essay": 8 - }, - "internal/cli/run_metrics.go": { - "essay": 1 - }, - "internal/cli/run_output.go": { - "essay": 1 - }, - "internal/cli/select.go": { - "complexity": 60, - "essay": 1, - "function-size": 153 - }, - "internal/cli/serve_frontend.go": { - "complexity": 6, - "function-size": 77 - }, - "internal/cli/session_lease.go": { - "essay": 4 - }, - "internal/cli/setup_manager.go": { - "essay": 2, - "file-size": 93 - }, - "internal/cli/shell_completion.go": { - "function-size": 76 - }, - "internal/cli/transcript.go": { - "essay": 1 - }, - "internal/cli/upgrade.go": { - "complexity": 1, - "essay": 2, - "function-size": 28 - }, - "internal/cli/width_test.go": { - "essay": 1 - }, - "internal/config/billing.go": { - "orphan": 1 - }, - "internal/config/cache_policy.go": { - "essay": 9 - }, - "internal/config/ccswitch.go": { - "essay": 2 - }, - "internal/config/config.go": { - "essay": 47, - "file-size": 1106 - }, - "internal/config/credentials.go": { - "essay": 1, - "file-size": 50 - }, - "internal/config/credentials_keyring_unix.go": { - "essay": 7 - }, - "internal/config/decode.go": { - "essay": 9 - }, - "internal/config/deepseek_protocol_migration.go": { - "orphan": 2 - }, - "internal/config/dotenv.go": { - "essay": 1 - }, - "internal/config/edit.go": { - "essay": 9, - "file-size": 1385 - }, - "internal/config/effort.go": { - "complexity": 1, - "essay": 11 - }, - "internal/config/effort_test.go": { - "essay": 2 - }, - "internal/config/load.go": { - "essay": 24, - "file-size": 1194, - "function-size": 46, - "orphan": 2 - }, - "internal/config/main_test.go": { - "essay": 1 - }, - "internal/config/mcpjson.go": { - "essay": 3 - }, - "internal/config/migrate.go": { - "orphan": 1 - }, - "internal/config/mutate.go": { - "essay": 2 - }, - "internal/config/mutate_test.go": { - "essay": 3 - }, - "internal/config/paths.go": { - "essay": 10 - }, - "internal/config/plugin_entry.go": { - "essay": 9 - }, - "internal/config/plugin_packages.go": { - "essay": 2 - }, - "internal/config/provider_isolation_test.go": { - "essay": 3 - }, - "internal/config/provider_presets.go": { - "claude-dialect": 1, - "file-size": 219 - }, - "internal/config/render.go": { - "complexity": 195, - "essay": 2, - "file-size": 571, - "function-size": 696 - }, - "internal/config/vision.go": { - "essay": 1, - "orphan": 1 - }, - "internal/control/approval.go": { - "essay": 19 - }, - "internal/control/approval_bridge.go": { - "essay": 1 - }, - "internal/control/approval_orchestration.go": { - "essay": 38, - "frontend-parity": 3 - }, - "internal/control/attachments.go": { - "orphan": 1 - }, - "internal/control/capability_scope.go": { - "frontend-parity": 1 - }, - "internal/control/checkpoint.go": { - "essay": 16 - }, - "internal/control/controller.go": { - "essay": 32, - "file-size": 594, - "frontend-parity": 6 - }, - "internal/control/controller_test.go": { - "essay": 9 - }, - "internal/control/errmsg.go": { - "essay": 2 - }, - "internal/control/extension_ui.go": { - "essay": 4, - "frontend-parity": 1 - }, - "internal/control/extensions.go": { - "essay": 5 - }, - "internal/control/goal.go": { - "complexity": 2, - "essay": 6, - "file-size": 193, - "struct-state": 9 - }, - "internal/control/goal_control.go": { - "essay": 1, - "frontend-parity": 1 - }, - "internal/control/goalusage.go": { - "essay": 2 - }, - "internal/control/headless_approval_test.go": { - "essay": 10 - }, - "internal/control/inbox.go": { - "frontend-parity": 2 - }, - "internal/control/input.go": { - "essay": 3, - "frontend-parity": 3 - }, - "internal/control/input_test.go": { - "essay": 4 - }, - "internal/control/mcp.go": { - "essay": 7 - }, - "internal/control/mcp_admin.go": { - "frontend-parity": 7 - }, - "internal/control/mcp_servers.go": { - "essay": 2, - "frontend-parity": 2 - }, - "internal/control/memory.go": { - "essay": 12 - }, - "internal/control/memory_command.go": { - "essay": 2 - }, - "internal/control/plan_todos.go": { - "essay": 6 - }, - "internal/control/planner_gate.go": { - "orphan": 1 - }, - "internal/control/port.go": { - "essay": 8 - }, - "internal/control/recovery.go": { - "essay": 1 - }, - "internal/control/recovery_test.go": { - "essay": 1 - }, - "internal/control/refs.go": { - "essay": 5, - "file-size": 403 - }, - "internal/control/session_lease_keeper.go": { - "essay": 5 - }, - "internal/control/session_lifecycle.go": { - "essay": 11, - "frontend-parity": 3 - }, - "internal/control/session_snapshot.go": { - "essay": 14 - }, - "internal/control/sessionpath.go": { - "essay": 6 - }, - "internal/control/shell_test.go": { - "essay": 2 - }, - "internal/control/skill.go": { - "essay": 4 - }, - "internal/control/slash.go": { - "complexity": 4, - "essay": 2 - }, - "internal/control/steer_fallback_test.go": { - "essay": 1 - }, - "internal/control/turn_cancel.go": { - "essay": 22, - "frontend-parity": 1, - "function-size": 4 - }, - "internal/control/turn_entry.go": { - "frontend-parity": 1 - }, - "internal/control/turn_orchestrator.go": { - "essay": 10, - "function-size": 3 - }, - "internal/control/turn_orchestrator_test.go": { - "essay": 1 - }, - "internal/control/turn_submit.go": { - "complexity": 3, - "essay": 5, - "frontend-parity": 1, - "function-size": 23 - }, - "internal/doctor/report.go": { - "essay": 3 - }, - "internal/doctor/session_bundle.go": { - "essay": 1 - }, - "internal/doctor/session_redact.go": { - "essay": 12 - }, - "internal/environment/probe.go": { - "essay": 5 - }, - "internal/environment/snapshot.go": { - "essay": 5 - }, - "internal/environment/snapshot_test.go": { - "essay": 2 - }, - "internal/event/event.go": { - "essay": 7 - }, - "internal/event/subagent_progress.go": { - "essay": 9 - }, - "internal/event/sync.go": { - "essay": 2 - }, - "internal/evidence/evidence.go": { - "essay": 2 - }, - "internal/evidence/ledger_queries.go": { - "essay": 6 - }, - "internal/evidence/review_report.go": { - "essay": 7 - }, - "internal/evidence/todos.go": { - "essay": 8 - }, - "internal/evidence/verification_command.go": { - "complexity": 6, - "essay": 18 - }, - "internal/evidence/verification_summary_test.go": { - "essay": 1 - }, - "internal/extension/adapters.go": { - "essay": 3 - }, - "internal/extension/builder.go": { - "essay": 21 - }, - "internal/extension/catalog.go": { - "essay": 6 - }, - "internal/extension/contributor.go": { - "essay": 1 - }, - "internal/extension/dispatch/dispatch.go": { - "essay": 19 - }, - "internal/extension/dispatch/payloads.go": { - "essay": 2 - }, - "internal/extension/intercept.go": { - "essay": 1 - }, - "internal/extension/metrics.go": { - "struct-state": 5 - }, - "internal/extension/protocol/dto_content.go": { - "essay": 1 - }, - "internal/extension/protocol/dto_provider.go": { - "essay": 3 - }, - "internal/extension/protocol/dto_ui.go": { - "essay": 4 - }, - "internal/extension/protocol/limits.go": { - "orphan": 1 - }, - "internal/extension/protocol/protocol.go": { - "essay": 5 - }, - "internal/extension/protocol/registry.go": { - "essay": 1 - }, - "internal/extension/protocol/validate.go": { - "complexity": 3 - }, - "internal/extension/protocolgen/sdkgo.go": { - "essay": 2 - }, - "internal/extension/providerext/provider.go": { - "essay": 1 - }, - "internal/extension/providerext/providerext.go": { - "essay": 5 - }, - "internal/extension/publish.go": { - "orphan": 1 - }, - "internal/extension/replace.go": { - "essay": 1, - "orphan": 1 - }, - "internal/extension/rpcwire/bootstrap.go": { - "orphan": 1 - }, - "internal/extension/rpcwire/conn.go": { - "essay": 11, - "file-size": 74 - }, - "internal/extension/rpcwire/stall_test.go": { - "essay": 1 - }, - "internal/extension/scope_resources.go": { - "orphan": 2 - }, - "internal/extension/sessionstate.go": { - "orphan": 1 - }, - "internal/extension/sidecar/client.go": { - "essay": 3 - }, - "internal/extension/sidecar/content.go": { - "essay": 2 - }, - "internal/extension/sidecar/externalize.go": { - "essay": 9 - }, - "internal/extension/sidecar/fake_test.go": { - "essay": 9 - }, - "internal/extension/sidecar/probe_client.go": { - "orphan": 1 - }, - "internal/extension/snapshot.go": { - "essay": 1 - }, - "internal/extension/source.go": { - "essay": 2 - }, - "internal/extension/uihub/hub.go": { - "essay": 6 - }, - "internal/fileref/search.go": { - "essay": 1 - }, - "internal/fileutil/atomicwrite.go": { + "internal/base/fileutil/atomicwrite.go": { "essay": 18, "orphan": 1 }, - "internal/fileutil/atomicwrite_test.go": { + "internal/base/fileutil/atomicwrite_test.go": { "essay": 2 }, - "internal/fileutil/replacefallback_other.go": { + "internal/base/fileutil/replacefallback_other.go": { "essay": 1 }, - "internal/fileutil/replacefallback_windows_test.go": { + "internal/base/fileutil/replacefallback_windows_test.go": { "essay": 1 }, - "internal/gitcmd/gitcmd.go": { - "essay": 14 + "internal/base/i18n/catalog_parity_test.go": { + "essay": 13 }, - "internal/guardian/guardian.go": { - "essay": 25 + "internal/base/i18n/i18n.go": { + "essay": 6 }, - "internal/guardian/guardian_policy.md": { - "doc-prose": 1 + "internal/base/proc/kill_other.go": { + "essay": 1 }, - "internal/history/indexed.go": { + "internal/base/proc/kill_windows.go": { + "essay": 5 + }, + "internal/base/secrets/redact.go": { + "complexity": 9, + "essay": 1, + "layer-order": 1 + }, + "internal/base/shellparse/bash.go": { + "essay": 8 + }, + "internal/contract/config/anthropic_contract.go": { + "layer-order": 1 + }, + "internal/contract/config/billing.go": { + "layer-order": 1, "orphan": 1 }, - "internal/hook/hook.go": { + "internal/contract/config/cache_policy.go": { + "essay": 9 + }, + "internal/contract/config/capability_activation.go": { + "layer-order": 1 + }, + "internal/contract/config/ccswitch.go": { + "essay": 2 + }, + "internal/contract/config/config.go": { + "essay": 47, + "file-size": 1106 + }, + "internal/contract/config/credentials.go": { + "essay": 1, + "file-size": 50 + }, + "internal/contract/config/credentials_keyring_unix.go": { + "essay": 7 + }, + "internal/contract/config/decode.go": { + "essay": 9 + }, + "internal/contract/config/deepseek_catalog.go": { + "layer-order": 1 + }, + "internal/contract/config/deepseek_protocol_migration.go": { + "orphan": 2 + }, + "internal/contract/config/dotenv.go": { + "essay": 1 + }, + "internal/contract/config/edit.go": { + "essay": 9, + "file-size": 1385, + "layer-order": 2 + }, + "internal/contract/config/effort.go": { + "complexity": 1, + "essay": 11, + "layer-order": 1 + }, + "internal/contract/config/effort_test.go": { + "essay": 2 + }, + "internal/contract/config/fetch.go": { + "layer-order": 1 + }, + "internal/contract/config/load.go": { + "essay": 24, + "file-size": 1194, + "function-size": 46, + "layer-order": 1, + "orphan": 2 + }, + "internal/contract/config/main_test.go": { + "essay": 1 + }, + "internal/contract/config/mcpjson.go": { + "essay": 3 + }, + "internal/contract/config/migrate.go": { + "orphan": 1 + }, + "internal/contract/config/mutate.go": { + "essay": 2 + }, + "internal/contract/config/mutate_test.go": { + "essay": 3 + }, + "internal/contract/config/paths.go": { + "essay": 10, + "layer-order": 1 + }, + "internal/contract/config/plugin_entry.go": { + "essay": 9 + }, + "internal/contract/config/plugin_packages.go": { + "essay": 2, + "layer-order": 2 + }, + "internal/contract/config/pricing.go": { + "layer-order": 1 + }, + "internal/contract/config/probe_failure.go": { + "layer-order": 1 + }, + "internal/contract/config/protocol_declared.go": { + "layer-order": 1 + }, + "internal/contract/config/provider_isolation_test.go": { + "essay": 3 + }, + "internal/contract/config/provider_presets.go": { + "claude-dialect": 1, + "file-size": 219 + }, + "internal/contract/config/render.go": { + "complexity": 195, + "essay": 2, + "file-size": 571, + "function-size": 696, + "layer-order": 1 + }, + "internal/contract/config/systemone_migrate.go": { + "layer-order": 1 + }, + "internal/contract/config/vision.go": { + "essay": 1, + "layer-order": 1, + "orphan": 1 + }, + "internal/contract/event/audit_forwarder.go": { + "layer-order": 1 + }, + "internal/contract/event/coalesce.go": { + "layer-order": 1 + }, + "internal/contract/event/costquote_sink.go": { + "layer-order": 1 + }, + "internal/contract/event/event.go": { + "essay": 7, + "layer-order": 2 + }, + "internal/contract/event/record.go": { + "layer-order": 1 + }, + "internal/contract/event/subagent_progress.go": { + "essay": 9 + }, + "internal/contract/event/sync.go": { + "essay": 2, + "layer-order": 1 + }, + "internal/contract/eventwire/wire.go": { + "layer-order": 1 + }, + "internal/contract/plancontract/project.go": { + "layer-order": 1, + "orphan": 1 + }, + "internal/contract/provider/provider.go": { + "essay": 37, + "file-size": 15 + }, + "internal/contract/provider/retry.go": { + "essay": 10 + }, + "internal/contract/provider/schema_canonicalize.go": { + "essay": 4 + }, + "internal/contract/provider/schema_dialect.go": { + "essay": 19 + }, + "internal/contract/provider/schema_dialect_test.go": { + "essay": 1 + }, + "internal/contract/provider/schema_validate.go": { + "essay": 2 + }, + "internal/contract/provider/usage.go": { + "essay": 11 + }, + "internal/contract/taskcontract/proof.go": { + "layer-order": 1 + }, + "internal/contract/taskcontract/taskcontract.go": { + "essay": 1, + "layer-order": 1 + }, + "internal/contract/tool/contract.go": { + "essay": 1, + "orphan": 1 + }, + "internal/contract/tool/contract_lock_test.go": { + "essay": 2 + }, + "internal/contract/tool/contract_test.go": { + "essay": 4 + }, + "internal/contract/tool/resolved.go": { + "essay": 1 + }, + "internal/contract/tool/shell_execution.go": { + "essay": 3 + }, + "internal/contract/tool/tool.go": { + "essay": 15 + }, + "internal/ext/extension/adapters.go": { + "essay": 3 + }, + "internal/ext/extension/builder.go": { + "essay": 21 + }, + "internal/ext/extension/catalog.go": { + "essay": 6 + }, + "internal/ext/extension/contributor.go": { + "essay": 1 + }, + "internal/ext/extension/dispatch/dispatch.go": { + "essay": 19 + }, + "internal/ext/extension/dispatch/payloads.go": { + "essay": 2 + }, + "internal/ext/extension/intercept.go": { + "essay": 1 + }, + "internal/ext/extension/metrics.go": { + "struct-state": 5 + }, + "internal/ext/extension/protocol/dto_content.go": { + "essay": 1 + }, + "internal/ext/extension/protocol/dto_provider.go": { + "essay": 3 + }, + "internal/ext/extension/protocol/dto_ui.go": { + "essay": 4 + }, + "internal/ext/extension/protocol/limits.go": { + "orphan": 1 + }, + "internal/ext/extension/protocol/protocol.go": { + "essay": 5 + }, + "internal/ext/extension/protocol/registry.go": { + "essay": 1 + }, + "internal/ext/extension/protocol/validate.go": { + "complexity": 3 + }, + "internal/ext/extension/protocolgen/sdkgo.go": { + "essay": 2 + }, + "internal/ext/extension/providerext/provider.go": { + "essay": 1 + }, + "internal/ext/extension/providerext/providerext.go": { + "essay": 5 + }, + "internal/ext/extension/publish.go": { + "orphan": 1 + }, + "internal/ext/extension/replace.go": { + "essay": 1, + "orphan": 1 + }, + "internal/ext/extension/rpcwire/bootstrap.go": { + "orphan": 1 + }, + "internal/ext/extension/rpcwire/conn.go": { + "essay": 11, + "file-size": 74 + }, + "internal/ext/extension/rpcwire/stall_test.go": { + "essay": 1 + }, + "internal/ext/extension/scope_resources.go": { + "orphan": 2 + }, + "internal/ext/extension/sessionstate.go": { + "orphan": 1 + }, + "internal/ext/extension/sidecar/client.go": { + "essay": 3 + }, + "internal/ext/extension/sidecar/content.go": { + "essay": 2 + }, + "internal/ext/extension/sidecar/externalize.go": { + "essay": 9 + }, + "internal/ext/extension/sidecar/fake_test.go": { + "essay": 9 + }, + "internal/ext/extension/sidecar/probe_client.go": { + "orphan": 1 + }, + "internal/ext/extension/snapshot.go": { + "essay": 1 + }, + "internal/ext/extension/source.go": { + "essay": 2 + }, + "internal/ext/extension/uihub/hub.go": { + "essay": 6 + }, + "internal/ext/hook/hook.go": { "complexity": 15, "essay": 44, "file-size": 788 }, - "internal/hook/hook_test.go": { + "internal/ext/hook/hook_test.go": { "essay": 8 }, - "internal/hook/runner.go": { + "internal/ext/hook/runner.go": { "essay": 2 }, - "internal/hook/windows_compat.go": { + "internal/ext/hook/windows_compat.go": { "essay": 1 }, - "internal/i18n/catalog_parity_test.go": { - "essay": 13 - }, - "internal/i18n/i18n.go": { - "essay": 6 - }, - "internal/installlayout/activate.go": { - "complexity": 7, - "function-size": 32 - }, - "internal/installlayout/current.go": { - "orphan": 1 - }, - "internal/installsource/apply.go": { + "internal/ext/installsource/apply.go": { "essay": 3 }, - "internal/installsource/install_source.go": { + "internal/ext/installsource/install_source.go": { "essay": 2 }, - "internal/installsource/install_source_test.go": { + "internal/ext/installsource/install_source_test.go": { "essay": 2 }, - "internal/installsource/mcp.go": { + "internal/ext/installsource/mcp.go": { "essay": 1 }, - "internal/installsource/plugin_package.go": { + "internal/ext/installsource/plugin_package.go": { "complexity": 9, "essay": 7, "function-size": 38 }, - "internal/installsource/skill.go": { + "internal/ext/installsource/skill.go": { "essay": 4 }, - "internal/installsource/ssrf.go": { + "internal/ext/installsource/ssrf.go": { "essay": 6 }, - "internal/installsource/types.go": { + "internal/ext/installsource/types.go": { "essay": 2 }, - "internal/instruction/resolver.go": { - "essay": 1 - }, - "internal/jobs/artifacts_test.go": { + "internal/ext/plugin/chrome_devtools_live_test.go": { "essay": 5 }, - "internal/jobs/jobs.go": { - "essay": 42, - "file-size": 1135, - "orphan": 1 - }, - "internal/jobs/jobs_extra_test.go": { - "essay": 1 - }, - "internal/jobs/jobs_security_test.go": { - "essay": 4 - }, - "internal/memory/doc.go": { - "essay": 1 - }, - "internal/memory/memory.go": { - "essay": 2 - }, - "internal/memory/store.go": { - "essay": 6, - "file-size": 24 - }, - "internal/memory/store_v2.go": { - "complexity": 17, - "function-size": 17 - }, - "internal/permission/bash_decompose.go": { - "essay": 23 - }, - "internal/permission/permission.go": { - "essay": 17, - "file-size": 71 - }, - "internal/permission/permission_extra_test.go": { - "essay": 1 - }, - "internal/plancontract/project.go": { - "orphan": 1 - }, - "internal/plugin/chrome_devtools_live_test.go": { - "essay": 5 - }, - "internal/plugin/codegraph_limit.go": { + "internal/ext/plugin/codegraph_limit.go": { "essay": 3 }, - "internal/plugin/known_overrides.go": { + "internal/ext/plugin/known_overrides.go": { "essay": 2 }, - "internal/plugin/launcher_lock.go": { + "internal/ext/plugin/launcher_lock.go": { "essay": 5 }, - "internal/plugin/lazy.go": { + "internal/ext/plugin/lazy.go": { "essay": 40 }, - "internal/plugin/lazy_test.go": { + "internal/ext/plugin/lazy_test.go": { "essay": 19 }, - "internal/plugin/plugin.go": { + "internal/ext/plugin/plugin.go": { "essay": 28, "file-size": 925, "function-size": 12, "orphan": 3 }, - "internal/plugin/plugin_test.go": { + "internal/ext/plugin/plugin_test.go": { "essay": 10 }, - "internal/plugin/registration_scope.go": { + "internal/ext/plugin/registration_scope.go": { "orphan": 1 }, - "internal/plugin/security.go": { + "internal/ext/plugin/security.go": { "essay": 3 }, - "internal/plugin/stats.go": { + "internal/ext/plugin/stats.go": { "essay": 18 }, - "internal/plugin/stats_test.go": { + "internal/ext/plugin/stats_test.go": { "essay": 1 }, - "internal/plugin/stdio_cancel_test.go": { + "internal/ext/plugin/stdio_cancel_test.go": { "essay": 1 }, - "internal/plugin/transport_http.go": { + "internal/ext/plugin/transport_http.go": { "essay": 5 }, - "internal/plugin/transport_http_test.go": { + "internal/ext/plugin/transport_http_test.go": { "essay": 1 }, - "internal/plugin/transport_stdio.go": { + "internal/ext/plugin/transport_stdio.go": { "essay": 11, "file-size": 4 }, - "internal/pluginpkg/claude_compat.go": { + "internal/ext/pluginpkg/claude_compat.go": { "essay": 19, "function-size": 6 }, - "internal/pluginpkg/manifest_v1.go": { + "internal/ext/pluginpkg/manifest_v1.go": { "essay": 7 }, - "internal/pluginpkg/pluginpkg.go": { + "internal/ext/pluginpkg/pluginpkg.go": { "complexity": 1, "essay": 2, "file-size": 398 }, - "internal/pluginpkg/state_lock_test.go": { + "internal/ext/pluginpkg/state_lock_test.go": { "essay": 1 }, - "internal/proc/kill_other.go": { + "internal/ext/skill/builtincontent/embed.go": { + "orphan": 1 + }, + "internal/ext/skill/builtins.go": { + "essay": 2 + }, + "internal/ext/skill/index.go": { + "orphan": 1 + }, + "internal/ext/skill/skill.go": { + "essay": 7, + "file-size": 557 + }, + "internal/ext/skill/tools.go": { + "essay": 2 + }, + "internal/ext/skill/tools_test.go": { + "essay": 2 + }, + "internal/ext/theme/tokens.go": { + "orphan": 1 + }, + "internal/frontend/acp/clientio.go": { + "essay": 4 + }, + "internal/frontend/acp/dispatch.go": { + "essay": 16 + }, + "internal/frontend/acp/dispatch_extension_test.go": { "essay": 1 }, - "internal/proc/kill_windows.go": { - "essay": 5 + "internal/frontend/acp/e2e_test.go": { + "essay": 2 }, - "internal/provider/anthropic/anthropic.go": { + "internal/frontend/acp/extension_models.go": { + "essay": 2 + }, + "internal/frontend/acp/live_test.go": { + "essay": 1 + }, + "internal/frontend/acp/protocol.go": { + "essay": 13, + "file-size": 26 + }, + "internal/frontend/acp/server.go": { + "essay": 4 + }, + "internal/frontend/acp/server_test.go": { + "essay": 1 + }, + "internal/frontend/acp/service.go": { + "essay": 49, + "file-size": 876, + "function-size": 97, + "struct-state": 2 + }, + "internal/frontend/acp/service_lock_test.go": { + "essay": 7 + }, + "internal/frontend/acp/session.go": { + "essay": 6 + }, + "internal/frontend/acp/session_config.go": { + "essay": 6 + }, + "internal/frontend/acp/status.go": { + "file-size": 20 + }, + "internal/frontend/acp/switch_recovery_test.go": { + "essay": 7 + }, + "internal/frontend/capdiag/collect.go": { + "essay": 1 + }, + "internal/frontend/capdiag/render.go": { + "orphan": 1 + }, + "internal/frontend/cli/acp.go": { + "essay": 7, + "function-size": 31 + }, + "internal/frontend/cli/buildinfo.go": { + "essay": 7 + }, + "internal/frontend/cli/cli.go": { + "complexity": 32, + "essay": 41, + "file-size": 1079, + "function-size": 167 + }, + "internal/frontend/cli/cli_test.go": { + "essay": 9 + }, + "internal/frontend/cli/default_model.go": { + "essay": 12 + }, + "internal/frontend/cli/extension_surface.go": { + "essay": 4 + }, + "internal/frontend/cli/hook_machine.go": { + "essay": 3 + }, + "internal/frontend/cli/mathnode.go": { + "essay": 1 + }, + "internal/frontend/cli/mcp.go": { + "essay": 1 + }, + "internal/frontend/cli/md.go": { + "essay": 7 + }, + "internal/frontend/cli/remote_connect.go": { + "essay": 3 + }, + "internal/frontend/cli/review.go": { + "essay": 8 + }, + "internal/frontend/cli/run_metrics.go": { + "essay": 1 + }, + "internal/frontend/cli/run_output.go": { + "essay": 1 + }, + "internal/frontend/cli/select.go": { + "complexity": 60, + "essay": 1, + "function-size": 153 + }, + "internal/frontend/cli/serve_frontend.go": { + "complexity": 6, + "function-size": 77 + }, + "internal/frontend/cli/session_lease.go": { + "essay": 4 + }, + "internal/frontend/cli/setup_manager.go": { + "essay": 2, + "file-size": 93 + }, + "internal/frontend/cli/shell_completion.go": { + "function-size": 76 + }, + "internal/frontend/cli/transcript.go": { + "essay": 1 + }, + "internal/frontend/cli/upgrade.go": { + "complexity": 1, + "essay": 2, + "function-size": 28 + }, + "internal/frontend/cli/width_test.go": { + "essay": 1 + }, + "internal/frontend/doctor/report.go": { + "essay": 3 + }, + "internal/frontend/doctor/session_bundle.go": { + "essay": 1 + }, + "internal/frontend/doctor/session_redact.go": { + "essay": 12 + }, + "internal/frontend/serve/auth.go": { + "essay": 2 + }, + "internal/frontend/serve/provider_setup.go": { + "essay": 1 + }, + "internal/frontend/serve/serve.go": { + "essay": 22, + "file-size": 383 + }, + "internal/frontend/serve/serve_lease_test.go": { + "essay": 3 + }, + "internal/frontend/serve/serve_lock_test.go": { + "essay": 1 + }, + "internal/frontend/serve/settings.go": { + "essay": 1 + }, + "internal/frontend/serve/switch_recovery_test.go": { + "essay": 2 + }, + "internal/model/anthropic/anthropic.go": { "complexity": 40, "essay": 31, "file-size": 80, "function-size": 142, "struct-state": 5 }, - "internal/provider/anthropic/anthropic_test.go": { + "internal/model/anthropic/anthropic_test.go": { "essay": 1 }, - "internal/provider/openai/host.go": { + "internal/model/billing/migrate.go": { + "orphan": 1 + }, + "internal/model/openai/host.go": { "essay": 8 }, - "internal/provider/openai/openai.go": { + "internal/model/openai/openai.go": { "complexity": 58, "essay": 32, "file-size": 515, "function-size": 245 }, - "internal/provider/openai/openai_test.go": { + "internal/model/openai/openai_test.go": { "essay": 5 }, - "internal/provider/openai/realcache_test.go": { + "internal/model/openai/realcache_test.go": { "essay": 7 }, - "internal/provider/provider.go": { - "essay": 37, - "file-size": 15 - }, - "internal/provider/responses/responses.go": { + "internal/model/responses/responses.go": { "essay": 11, "struct-state": 5 }, - "internal/provider/responses/responses_test.go": { + "internal/model/responses/responses_test.go": { "essay": 5 }, - "internal/provider/responses/vendor.go": { + "internal/model/responses/vendor.go": { "essay": 19 }, - "internal/provider/retry.go": { - "essay": 10 + "internal/platform/environment/probe.go": { + "essay": 5 }, - "internal/provider/schema_canonicalize.go": { - "essay": 4 + "internal/platform/environment/snapshot.go": { + "essay": 5 }, - "internal/provider/schema_dialect.go": { - "essay": 19 - }, - "internal/provider/schema_dialect_test.go": { - "essay": 1 - }, - "internal/provider/schema_validate.go": { + "internal/platform/environment/snapshot_test.go": { "essay": 2 }, - "internal/provider/usage.go": { - "essay": 11 + "internal/platform/gitcmd/gitcmd.go": { + "essay": 14 }, - "internal/recovery/decision.go": { - "essay": 9 + "internal/platform/installlayout/activate.go": { + "complexity": 7, + "function-size": 32 }, - "internal/recovery/decision_test.go": { - "essay": 1 + "internal/platform/installlayout/current.go": { + "orphan": 1 }, - "internal/recovery/gate.go": { - "essay": 4, - "file-size": 393 + "internal/platform/instanceid/instanceid.go": { + "layer-order": 1 }, - "internal/recovery/rules.go": { - "complexity": 19, - "essay": 1, - "file-size": 154 - }, - "internal/recovery/types.go": { - "essay": 1 - }, - "internal/remote/auth.go": { + "internal/platform/remote/auth.go": { "essay": 7 }, - "internal/remote/bootstrap/ensure_test.go": { + "internal/platform/remote/bootstrap/ensure_test.go": { "essay": 2 }, - "internal/remote/bootstrap/launch.go": { + "internal/platform/remote/bootstrap/launch.go": { "essay": 7 }, - "internal/remote/client_test.go": { + "internal/platform/remote/client_test.go": { "essay": 1 }, - "internal/remote/dial.go": { + "internal/platform/remote/dial.go": { "essay": 3 }, - "internal/remote/forward/forward.go": { + "internal/platform/remote/forward/forward.go": { "essay": 2 }, - "internal/remote/knownhosts.go": { + "internal/platform/remote/knownhosts.go": { "essay": 1 }, - "internal/remote/remote.go": { + "internal/platform/remote/remote.go": { "error-text": 5, "essay": 4 }, - "internal/remote/sftpfs/sftpfs_test.go": { + "internal/platform/remote/sftpfs/sftpfs_test.go": { "essay": 2 }, - "internal/remote/sshconfig.go": { + "internal/platform/remote/sshconfig.go": { "essay": 2 }, - "internal/repair/apply_failure.go": { + "internal/platform/repair/apply_failure.go": { "orphan": 2 }, - "internal/repair/config.go": { + "internal/platform/repair/config.go": { "complexity": 12 }, - "internal/repair/config_test.go": { + "internal/platform/repair/config_test.go": { "essay": 1 }, - "internal/repair/derived.go": { + "internal/platform/repair/derived.go": { "orphan": 1 }, - "internal/repair/mutation_lock.go": { + "internal/platform/repair/mutation_lock.go": { "essay": 4, "orphan": 2 }, - "internal/repair/plan.go": { + "internal/platform/repair/plan.go": { "essay": 2, "file-size": 48, "orphan": 2 }, - "internal/repair/snapshot.go": { + "internal/platform/repair/snapshot.go": { "complexity": 9, "essay": 1, "function-size": 34, "orphan": 1 }, - "internal/repair/startup.go": { + "internal/platform/repair/startup.go": { "orphan": 1 }, - "internal/repair/transaction.go": { + "internal/platform/repair/transaction.go": { "complexity": 22, "essay": 4, "function-size": 86, "orphan": 1 }, - "internal/repair/update.go": { + "internal/platform/repair/update.go": { "complexity": 109, "essay": 43, "file-size": 2895, "function-size": 308, "orphan": 12 }, - "internal/repair/update_handoff_darwin_smoke_test.go": { + "internal/platform/repair/update_handoff_darwin_smoke_test.go": { "essay": 4 }, - "internal/repair/update_legacy.go": { + "internal/platform/repair/update_legacy.go": { "complexity": 1, "essay": 8, "orphan": 2 }, - "internal/repair/update_lock_test.go": { + "internal/platform/repair/update_lock_test.go": { "essay": 1 }, - "internal/repair/update_test.go": { + "internal/platform/repair/update_test.go": { "essay": 2 }, - "internal/sandbox/sandbox.go": { - "essay": 11 + "internal/platform/telemetry/sink.go": { + "layer-order": 1 }, - "internal/sandbox/seatbelt_darwin.go": { - "essay": 3 - }, - "internal/sandbox/seatbelt_other.go": { - "essay": 4 - }, - "internal/sandbox/session_temp_env.go": { - "essay": 1 - }, - "internal/sandbox/shell.go": { - "essay": 1 - }, - "internal/secrets/redact.go": { - "complexity": 9, - "essay": 1 - }, - "internal/serve/auth.go": { - "essay": 2 - }, - "internal/serve/provider_setup.go": { - "essay": 1 - }, - "internal/serve/serve.go": { - "essay": 22, - "file-size": 383 - }, - "internal/serve/serve_lease_test.go": { - "essay": 3 - }, - "internal/serve/serve_lock_test.go": { - "essay": 1 - }, - "internal/serve/settings.go": { - "essay": 1 - }, - "internal/serve/switch_recovery_test.go": { - "essay": 2 - }, - "internal/sessiontemp/manager.go": { - "essay": 5, - "orphan": 1 - }, - "internal/shellparse/bash.go": { - "essay": 8 - }, - "internal/shellrun/runner.go": { - "essay": 4 - }, - "internal/shellsafe/bash_redirect.go": { - "essay": 5 - }, - "internal/shellsafe/shellsafe.go": { - "essay": 1 - }, - "internal/skill/builtincontent/embed.go": { - "orphan": 1 - }, - "internal/skill/builtins.go": { - "essay": 2 - }, - "internal/skill/index.go": { - "orphan": 1 - }, - "internal/skill/skill.go": { - "essay": 7, - "file-size": 557 - }, - "internal/skill/tools.go": { - "essay": 2 - }, - "internal/skill/tools_test.go": { - "essay": 2 - }, - "internal/stats/query.go": { - "essay": 2 - }, - "internal/stats/record.go": { - "essay": 7 - }, - "internal/stats/recorder.go": { - "essay": 1 - }, - "internal/store/remote.go": { - "essay": 6 - }, - "internal/store/session.go": { - "essay": 8 - }, - "internal/taskcontract/taskcontract.go": { - "essay": 1 - }, - "internal/taskmonitor/control.go": { - "complexity": 21, - "essay": 1, - "function-size": 127 - }, - "internal/taskmonitor/jsonstore.go": { - "essay": 3, - "orphan": 1 - }, - "internal/taskmonitor/memory.go": { - "essay": 5, - "orphan": 1 - }, - "internal/taskmonitor/store.go": { - "essay": 8 - }, - "internal/taskmonitor/tmux.go": { - "orphan": 1 - }, - "internal/theme/tokens.go": { - "orphan": 1 - }, - "internal/tool/builtin/bash.go": { - "essay": 11, - "orphan": 1 - }, - "internal/tool/builtin/bash_env_test.go": { - "essay": 4 - }, - "internal/tool/builtin/bgjobs.go": { - "essay": 10 - }, - "internal/tool/builtin/bgjobs_test.go": { - "essay": 6 - }, - "internal/tool/builtin/builtin_test.go": { - "essay": 3 - }, - "internal/tool/builtin/clientio.go": { - "essay": 14 - }, - "internal/tool/builtin/completestep.go": { - "essay": 1 - }, - "internal/tool/builtin/confine.go": { - "essay": 16 - }, - "internal/tool/builtin/encoding_helpers.go": { - "essay": 1 - }, - "internal/tool/builtin/gitignore.go": { - "essay": 4 - }, - "internal/tool/builtin/glob.go": { - "essay": 3 - }, - "internal/tool/builtin/grep.go": { - "essay": 1 - }, - "internal/tool/builtin/managed_config.go": { - "essay": 2 - }, - "internal/tool/builtin/multiedit.go": { - "essay": 1 - }, - "internal/tool/builtin/notebookedit.go": { - "essay": 6 - }, - "internal/tool/builtin/preview.go": { - "essay": 7 - }, - "internal/tool/builtin/readfile.go": { - "function-size": 12 - }, - "internal/tool/builtin/session_guard.go": { - "essay": 25 - }, - "internal/tool/builtin/updategoal.go": { - "essay": 2 - }, - "internal/tool/builtin/webfetch.go": { - "essay": 3, - "function-size": 2 - }, - "internal/tool/builtin/workspace.go": { - "essay": 12 - }, - "internal/tool/builtin/writefile.go": { - "essay": 2 - }, - "internal/tool/contract.go": { - "essay": 1, - "orphan": 1 - }, - "internal/tool/contract_lock_test.go": { - "essay": 2 - }, - "internal/tool/contract_test.go": { - "essay": 4 - }, - "internal/tool/resolved.go": { - "essay": 1 - }, - "internal/tool/shell_execution.go": { - "essay": 3 - }, - "internal/tool/tool.go": { - "essay": 15 - }, - "internal/update/apply_darwin.go": { + "internal/platform/update/apply_darwin.go": { "complexity": 42, "essay": 1, "function-size": 180 }, - "internal/update/install_windows.go": { + "internal/platform/update/install_windows.go": { "essay": 1 }, - "internal/update/manifest.go": { + "internal/platform/update/manifest.go": { "essay": 1 }, + "internal/runtime/agent/agent.go": { + "complexity": 37, + "essay": 33, + "file-size": 1223, + "function-size": 102 + }, + "internal/runtime/agent/agent_options.go": { + "essay": 10 + }, + "internal/runtime/agent/ask.go": { + "essay": 1 + }, + "internal/runtime/agent/branch.go": { + "essay": 10, + "orphan": 3 + }, + "internal/runtime/agent/cache_shape.go": { + "essay": 3 + }, + "internal/runtime/agent/cache_shape_test.go": { + "essay": 1 + }, + "internal/runtime/agent/capability_gate.go": { + "essay": 7 + }, + "internal/runtime/agent/capability_gate_test.go": { + "essay": 1 + }, + "internal/runtime/agent/compact_test.go": { + "essay": 1 + }, + "internal/runtime/agent/context_manager.go": { + "essay": 1 + }, + "internal/runtime/agent/coordinator.go": { + "essay": 14, + "orphan": 1 + }, + "internal/runtime/agent/coordinator_test.go": { + "essay": 3 + }, + "internal/runtime/agent/delivery_hardening_test.go": { + "essay": 3 + }, + "internal/runtime/agent/delivery_scope_test.go": { + "essay": 1 + }, + "internal/runtime/agent/dependent_writer_preview_test.go": { + "essay": 1 + }, + "internal/runtime/agent/empty_final_test.go": { + "essay": 5 + }, + "internal/runtime/agent/execute_batch.go": { + "complexity": 22, + "function-size": 108 + }, + "internal/runtime/agent/execute_one.go": { + "essay": 14 + }, + "internal/runtime/agent/extensions.go": { + "essay": 64 + }, + "internal/runtime/agent/extensions_test.go": { + "essay": 4 + }, + "internal/runtime/agent/final_readiness.go": { + "complexity": 1 + }, + "internal/runtime/agent/fleet.go": { + "essay": 3 + }, + "internal/runtime/agent/format.go": { + "orphan": 1 + }, + "internal/runtime/agent/listsessions_bench_test.go": { + "essay": 4 + }, + "internal/runtime/agent/migrate.go": { + "complexity": 32, + "essay": 23, + "file-size": 195, + "function-size": 73 + }, + "internal/runtime/agent/normalize.go": { + "essay": 14 + }, + "internal/runtime/agent/parallel_tasks.go": { + "essay": 3, + "function-size": 71 + }, + "internal/runtime/agent/parallel_tasks_test.go": { + "essay": 2 + }, + "internal/runtime/agent/preview.go": { + "essay": 17 + }, + "internal/runtime/agent/preview_test.go": { + "essay": 3 + }, + "internal/runtime/agent/profile_spec.go": { + "essay": 4 + }, + "internal/runtime/agent/reasoning_language.go": { + "essay": 2 + }, + "internal/runtime/agent/reasoning_warn_state.go": { + "complexity": 2, + "essay": 14 + }, + "internal/runtime/agent/recovery_gate.go": { + "essay": 8 + }, + "internal/runtime/agent/recovery_gc.go": { + "essay": 17 + }, + "internal/runtime/agent/recovery_gc_test.go": { + "essay": 1 + }, + "internal/runtime/agent/review_unavailable.go": { + "orphan": 1 + }, + "internal/runtime/agent/run_loop.go": { + "essay": 21, + "function-size": 2 + }, + "internal/runtime/agent/run_usage.go": { + "complexity": 1, + "essay": 5 + }, + "internal/runtime/agent/save.go": { + "complexity": 36, + "essay": 109, + "file-size": 1281, + "function-size": 95 + }, + "internal/runtime/agent/save_test.go": { + "essay": 9 + }, + "internal/runtime/agent/scheduler.go": { + "essay": 1 + }, + "internal/runtime/agent/session.go": { + "essay": 28 + }, + "internal/runtime/agent/session_compat_legacy_test.go": { + "essay": 3 + }, + "internal/runtime/agent/session_content.go": { + "orphan": 1 + }, + "internal/runtime/agent/session_display_index.go": { + "essay": 18, + "orphan": 2 + }, + "internal/runtime/agent/session_display_read_model.go": { + "orphan": 2 + }, + "internal/runtime/agent/session_events.go": { + "essay": 9, + "file-size": 82 + }, + "internal/runtime/agent/session_events_test.go": { + "essay": 3 + }, + "internal/runtime/agent/session_lease.go": { + "essay": 13 + }, + "internal/runtime/agent/session_lease_test.go": { + "essay": 4 + }, + "internal/runtime/agent/session_lock_windows.go": { + "essay": 4 + }, + "internal/runtime/agent/session_removal.go": { + "essay": 6 + }, + "internal/runtime/agent/steer_flush_test.go": { + "essay": 1 + }, + "internal/runtime/agent/subagent_progress.go": { + "essay": 10 + }, + "internal/runtime/agent/subagent_store.go": { + "essay": 5, + "file-size": 127 + }, + "internal/runtime/agent/task.go": { + "complexity": 12, + "essay": 35, + "file-size": 1121, + "function-size": 94, + "orphan": 1 + }, + "internal/runtime/agent/task_test.go": { + "essay": 4 + }, + "internal/runtime/agent/testutil/mock_provider.go": { + "essay": 10 + }, + "internal/runtime/agent/textsink.go": { + "essay": 9 + }, + "internal/runtime/agent/usecapability.go": { + "essay": 9, + "file-size": 713, + "function-size": 2 + }, + "internal/runtime/agent/width.go": { + "essay": 1 + }, + "internal/runtime/agent/write_claims.go": { + "orphan": 1 + }, + "internal/runtime/capability/audit.go": { + "struct-state": 6 + }, + "internal/runtime/capability/catalog.go": { + "essay": 1 + }, + "internal/runtime/evidence/evidence.go": { + "essay": 2 + }, + "internal/runtime/evidence/ledger_queries.go": { + "essay": 6 + }, + "internal/runtime/evidence/review_report.go": { + "essay": 7 + }, + "internal/runtime/evidence/todos.go": { + "essay": 8 + }, + "internal/runtime/evidence/verification_command.go": { + "complexity": 6, + "essay": 18 + }, + "internal/runtime/evidence/verification_summary_test.go": { + "essay": 1 + }, + "internal/runtime/jobs/artifacts_test.go": { + "essay": 5 + }, + "internal/runtime/jobs/jobs.go": { + "essay": 42, + "file-size": 1135, + "orphan": 1 + }, + "internal/runtime/jobs/jobs_extra_test.go": { + "essay": 1 + }, + "internal/runtime/jobs/jobs_security_test.go": { + "essay": 4 + }, + "internal/runtime/recovery/decision.go": { + "essay": 9 + }, + "internal/runtime/recovery/decision_test.go": { + "essay": 1 + }, + "internal/runtime/recovery/gate.go": { + "essay": 4, + "file-size": 393 + }, + "internal/runtime/recovery/rules.go": { + "complexity": 19, + "essay": 1, + "file-size": 154 + }, + "internal/runtime/recovery/types.go": { + "essay": 1 + }, + "internal/runtime/taskmonitor/control.go": { + "complexity": 21, + "essay": 1, + "function-size": 127 + }, + "internal/runtime/taskmonitor/jsonstore.go": { + "essay": 3, + "orphan": 1 + }, + "internal/runtime/taskmonitor/memory.go": { + "essay": 5, + "orphan": 1 + }, + "internal/runtime/taskmonitor/store.go": { + "essay": 8 + }, + "internal/runtime/taskmonitor/tmux.go": { + "orphan": 1 + }, + "internal/safety/guardian/guardian.go": { + "essay": 25, + "layer-order": 1 + }, + "internal/safety/guardian/guardian_policy.md": { + "doc-prose": 1 + }, + "internal/safety/permission/bash_decompose.go": { + "essay": 23 + }, + "internal/safety/permission/permission.go": { + "essay": 17, + "file-size": 71 + }, + "internal/safety/permission/permission_extra_test.go": { + "essay": 1 + }, + "internal/safety/sandbox/sandbox.go": { + "essay": 11 + }, + "internal/safety/sandbox/seatbelt_darwin.go": { + "essay": 3 + }, + "internal/safety/sandbox/seatbelt_other.go": { + "essay": 4 + }, + "internal/safety/sandbox/session_temp_env.go": { + "essay": 1 + }, + "internal/safety/sandbox/shell.go": { + "essay": 1 + }, + "internal/safety/shellsafe/bash_redirect.go": { + "essay": 5 + }, + "internal/safety/shellsafe/shellsafe.go": { + "essay": 1 + }, + "internal/session/control/approval.go": { + "essay": 19 + }, + "internal/session/control/approval_bridge.go": { + "essay": 1 + }, + "internal/session/control/approval_orchestration.go": { + "essay": 38, + "frontend-parity": 3 + }, + "internal/session/control/attachments.go": { + "orphan": 1 + }, + "internal/session/control/capability_scope.go": { + "frontend-parity": 1 + }, + "internal/session/control/checkpoint.go": { + "essay": 16 + }, + "internal/session/control/controller.go": { + "essay": 32, + "file-size": 594, + "frontend-parity": 6 + }, + "internal/session/control/controller_test.go": { + "essay": 9 + }, + "internal/session/control/errmsg.go": { + "essay": 2 + }, + "internal/session/control/extension_ui.go": { + "essay": 4, + "frontend-parity": 1 + }, + "internal/session/control/extensions.go": { + "essay": 5 + }, + "internal/session/control/goal.go": { + "complexity": 2, + "essay": 6, + "file-size": 193, + "struct-state": 9 + }, + "internal/session/control/goal_control.go": { + "essay": 1, + "frontend-parity": 1 + }, + "internal/session/control/goalusage.go": { + "essay": 2 + }, + "internal/session/control/headless_approval_test.go": { + "essay": 10 + }, + "internal/session/control/inbox.go": { + "frontend-parity": 2 + }, + "internal/session/control/input.go": { + "essay": 3, + "frontend-parity": 3 + }, + "internal/session/control/input_test.go": { + "essay": 4 + }, + "internal/session/control/mcp.go": { + "essay": 7 + }, + "internal/session/control/mcp_admin.go": { + "frontend-parity": 7 + }, + "internal/session/control/mcp_servers.go": { + "essay": 2, + "frontend-parity": 2 + }, + "internal/session/control/memory.go": { + "essay": 12 + }, + "internal/session/control/memory_command.go": { + "essay": 2 + }, + "internal/session/control/plan_todos.go": { + "essay": 6 + }, + "internal/session/control/planner_gate.go": { + "orphan": 1 + }, + "internal/session/control/port.go": { + "essay": 8 + }, + "internal/session/control/recovery.go": { + "essay": 1 + }, + "internal/session/control/recovery_test.go": { + "essay": 1 + }, + "internal/session/control/refs.go": { + "essay": 5, + "file-size": 403 + }, + "internal/session/control/session_lease_keeper.go": { + "essay": 5 + }, + "internal/session/control/session_lifecycle.go": { + "essay": 11, + "frontend-parity": 3 + }, + "internal/session/control/session_snapshot.go": { + "essay": 14 + }, + "internal/session/control/sessionpath.go": { + "essay": 6 + }, + "internal/session/control/shell_test.go": { + "essay": 2 + }, + "internal/session/control/skill.go": { + "essay": 4 + }, + "internal/session/control/slash.go": { + "complexity": 4, + "essay": 2 + }, + "internal/session/control/steer_fallback_test.go": { + "essay": 1 + }, + "internal/session/control/turn_cancel.go": { + "essay": 22, + "frontend-parity": 1, + "function-size": 4 + }, + "internal/session/control/turn_entry.go": { + "frontend-parity": 1 + }, + "internal/session/control/turn_orchestrator.go": { + "essay": 10, + "function-size": 3 + }, + "internal/session/control/turn_orchestrator_test.go": { + "essay": 1 + }, + "internal/session/control/turn_submit.go": { + "complexity": 3, + "essay": 5, + "frontend-parity": 1, + "function-size": 23 + }, + "internal/state/checkpoint/barrier.go": { + "essay": 1 + }, + "internal/state/checkpoint/checkpoint.go": { + "essay": 8, + "file-size": 291 + }, + "internal/state/checkpoint/observer.go": { + "essay": 1 + }, + "internal/state/checkpoint/transaction.go": { + "complexity": 24, + "essay": 2, + "file-size": 739, + "function-size": 73 + }, + "internal/state/history/indexed.go": { + "layer-order": 1, + "orphan": 1 + }, + "internal/state/history/search.go": { + "layer-order": 1 + }, + "internal/state/history/strip.go": { + "layer-order": 1 + }, + "internal/state/historycatalog/catalog.go": { + "layer-order": 1 + }, + "internal/state/historycatalog/incremental.go": { + "layer-order": 1 + }, + "internal/state/instruction/resolver.go": { + "essay": 1 + }, + "internal/state/memory/doc.go": { + "essay": 1 + }, + "internal/state/memory/memory.go": { + "essay": 2 + }, + "internal/state/memory/store.go": { + "essay": 6, + "file-size": 24 + }, + "internal/state/memory/store_v2.go": { + "complexity": 17, + "function-size": 17 + }, + "internal/state/migration/migration.go": { + "layer-order": 1 + }, + "internal/state/sessiontemp/manager.go": { + "essay": 5, + "orphan": 1 + }, + "internal/state/stats/query.go": { + "essay": 2 + }, + "internal/state/stats/record.go": { + "essay": 7 + }, + "internal/state/stats/recorder.go": { + "essay": 1 + }, + "internal/state/store/remote.go": { + "essay": 6 + }, + "internal/state/store/session.go": { + "essay": 8 + }, + "internal/state/trajectory/recorder.go": { + "layer-order": 1 + }, + "internal/tools/builtin/bash.go": { + "essay": 11, + "layer-order": 1, + "orphan": 1 + }, + "internal/tools/builtin/bash_env_test.go": { + "essay": 4 + }, + "internal/tools/builtin/bgjobs.go": { + "essay": 10, + "layer-order": 2 + }, + "internal/tools/builtin/bgjobs_test.go": { + "essay": 6 + }, + "internal/tools/builtin/builtin_test.go": { + "essay": 3 + }, + "internal/tools/builtin/clientio.go": { + "essay": 14 + }, + "internal/tools/builtin/completestep.go": { + "essay": 1, + "layer-order": 1 + }, + "internal/tools/builtin/confine.go": { + "essay": 16 + }, + "internal/tools/builtin/encoding_helpers.go": { + "essay": 1 + }, + "internal/tools/builtin/gitignore.go": { + "essay": 4 + }, + "internal/tools/builtin/glob.go": { + "essay": 3 + }, + "internal/tools/builtin/grep.go": { + "essay": 1 + }, + "internal/tools/builtin/managed_config.go": { + "essay": 2 + }, + "internal/tools/builtin/multiedit.go": { + "essay": 1 + }, + "internal/tools/builtin/notebookedit.go": { + "essay": 6 + }, + "internal/tools/builtin/pipe_status.go": { + "layer-order": 1 + }, + "internal/tools/builtin/preview.go": { + "essay": 7 + }, + "internal/tools/builtin/readfile.go": { + "function-size": 12 + }, + "internal/tools/builtin/session_guard.go": { + "essay": 25 + }, + "internal/tools/builtin/todo.go": { + "layer-order": 1 + }, + "internal/tools/builtin/updategoal.go": { + "essay": 2 + }, + "internal/tools/builtin/webfetch.go": { + "essay": 3, + "function-size": 2 + }, + "internal/tools/builtin/workspace.go": { + "essay": 12 + }, + "internal/tools/builtin/writefile.go": { + "essay": 2 + }, + "internal/tools/sessiontool/sessiontool.go": { + "layer-order": 1 + }, + "internal/tools/shellrun/runner.go": { + "essay": 4 + }, "release-notes/studio/2.0.0.md": { "release-note": 29 }, diff --git a/tools/repolint/dialect.go b/tools/repolint/dialect.go index 915e5badeb..d6fb10ad22 100644 --- a/tools/repolint/dialect.go +++ b/tools/repolint/dialect.go @@ -8,7 +8,7 @@ import ( ) // Claude caches only where cache_control marks a breakpoint, and that field is -// serialized by internal/provider/anthropic alone. The same model reached +// serialized by internal/model/anthropic alone. The same model reached // through an openai-kind entry is not an error and not a visible wire // difference — it is full input rate on every prompt token, forever, and the // only symptom is a cache_read that never arrives. @@ -113,7 +113,7 @@ func checkClaudeDialect(entries []providerDialect, vars map[string][]string) []F continue } out = append(out, Finding{entry.file, entry.line, ruleClaudeDialect, fmt.Sprintf( - "%q on the %q dialect: cache_control ships only from internal/provider/anthropic, so every prompt token bills at full input rate", + "%q on the %q dialect: cache_control ships only from internal/model/anthropic, so every prompt token bills at full input rate", model, entry.kind), 1}) break } diff --git a/tools/repolint/dialect_test.go b/tools/repolint/dialect_test.go index f10b6caec9..2b7f465dff 100644 --- a/tools/repolint/dialect_test.go +++ b/tools/repolint/dialect_test.go @@ -34,7 +34,7 @@ func flagged(t *testing.T, rel string) []Finding { // The models a preset offers are usually a package-level slice, so an entry // that never spells "claude" in its own literal is the ordinary case. func TestClaudeDialectResolvesModelsThroughAVariable(t *testing.T) { - got := flagged(t, "internal/config/presets.go") + got := flagged(t, "internal/contract/config/presets.go") if len(got) != 3 { t.Fatalf("findings = %d, want 3 (variable, inline, single): %v", len(got), got) } @@ -48,7 +48,7 @@ func TestClaudeDialectResolvesModelsThroughAVariable(t *testing.T) { // One finding per entry, not per model: the entry is what a fix changes. func TestClaudeDialectReportsEachEntryOnce(t *testing.T) { seen := map[int]bool{} - for _, f := range flagged(t, "internal/config/presets.go") { + for _, f := range flagged(t, "internal/contract/config/presets.go") { if seen[f.Line] { t.Fatalf("line %d reported twice", f.Line) } @@ -59,7 +59,7 @@ func TestClaudeDialectReportsEachEntryOnce(t *testing.T) { // The anthropic dialect is where cache_control comes from, so the same models // there are the fix, not the finding. func TestClaudeDialectAllowsTheAnthropicDialect(t *testing.T) { - for _, f := range flagged(t, "internal/config/presets.go") { + for _, f := range flagged(t, "internal/contract/config/presets.go") { if f.Line == 11 { t.Fatalf("anthropic-kind entry was flagged: %+v", f) } @@ -67,7 +67,7 @@ func TestClaudeDialectAllowsTheAnthropicDialect(t *testing.T) { } func TestClaudeDialectSkipsFixtures(t *testing.T) { - if got := flagged(t, "internal/config/presets_test.go"); len(got) != 0 { + if got := flagged(t, "internal/contract/config/presets_test.go"); len(got) != 0 { t.Fatalf("a test fixture was flagged: %v", got) } } diff --git a/tools/repolint/docs.go b/tools/repolint/docs.go index aec324ffd4..9892e81a23 100644 --- a/tools/repolint/docs.go +++ b/tools/repolint/docs.go @@ -47,8 +47,8 @@ var docClassByPrefix = []struct { {"CLAUDE.md", classMachine}, {".github/", classMachine}, {".reasonix/", classMachine}, - {"internal/skill/builtincontent/", classMachine}, - {"internal/guardian/", classMachine}, + {"internal/ext/skill/builtincontent/", classMachine}, + {"internal/safety/guardian/", classMachine}, } // docSkippedPrefixes are corpora and fixtures: text a benchmark or a test diff --git a/tools/repolint/flatview.go b/tools/repolint/flatview.go index 6abdaad4df..9dd577249d 100644 --- a/tools/repolint/flatview.go +++ b/tools/repolint/flatview.go @@ -11,16 +11,16 @@ import ( // over it, so the adapter's callers are a closed list. Asking instead whether a // read is "new" would judge intent, which nothing in the source records. var flatViewReaders = []string{ - "internal/frontmatter/frontmatter.go", // SplitLegacy, its one wrapper - "internal/command/command.go", // slash-command vocabulary - "internal/installsource/skill.go", // install-time skill sniffing - "internal/memory/store.go", // memory note vocabulary - "internal/outputstyle/outputstyle.go", // output-style vocabulary - "internal/pluginpkg/claude_compat.go", // imported Claude packages - "internal/pluginpkg/pluginpkg.go", // plugin manifest vocabulary - "internal/skill/builtincontent/embed.go", // shipped built-in bodies - "internal/skill/profile.go", // profile vocabulary - "internal/skill/skill.go", // the 17-key skill vocabulary + "internal/base/frontmatter/frontmatter.go", // SplitLegacy, its one wrapper + "internal/ext/command/command.go", // slash-command vocabulary + "internal/ext/installsource/skill.go", // install-time skill sniffing + "internal/state/memory/store.go", // memory note vocabulary + "internal/runtime/outputstyle/outputstyle.go", // output-style vocabulary + "internal/ext/pluginpkg/claude_compat.go", // imported Claude packages + "internal/ext/pluginpkg/pluginpkg.go", // plugin manifest vocabulary + "internal/ext/skill/builtincontent/embed.go", // shipped built-in bodies + "internal/ext/skill/profile.go", // profile vocabulary + "internal/ext/skill/skill.go", // the 17-key skill vocabulary } // flatViewCalls are the two entry points into the lossy view, named so a diff --git a/tools/repolint/flatview_test.go b/tools/repolint/flatview_test.go index 052fa37ad8..bb5feca214 100644 --- a/tools/repolint/flatview_test.go +++ b/tools/repolint/flatview_test.go @@ -4,7 +4,7 @@ import "testing" const flatViewSource = `package p -import "reasonix/internal/frontmatter" +import "reasonix/internal/base/frontmatter" func a(s string) map[string]string { fm, _ := frontmatter.SplitLegacy(s) @@ -37,12 +37,12 @@ func TestFlatViewFlagsBothEntryPointsOutsideTheList(t *testing.T) { // Reading the structure is the whole point of the boundary, so a declared // reader and the structured accessors are both left alone. func TestFlatViewLeavesDeclaredReadersAndStructuredAccessAlone(t *testing.T) { - if got := checkFlatView(parseBytes("internal/skill/skill.go", []byte(flatViewSource))); len(got) != 0 { + if got := checkFlatView(parseBytes("internal/ext/skill/skill.go", []byte(flatViewSource))); len(got) != 0 { t.Fatalf("a declared reader was flagged: %v", got) } structured := `package p -import "reasonix/internal/frontmatter" +import "reasonix/internal/base/frontmatter" func c(s string) bool { doc, _ := frontmatter.Parse(s) diff --git a/tools/repolint/frontendparity.go b/tools/repolint/frontendparity.go index eac5868708..7bdafc200f 100644 --- a/tools/repolint/frontendparity.go +++ b/tools/repolint/frontendparity.go @@ -13,16 +13,16 @@ import ( // narrowing edit would quietly erase its own debt. type frontendPort struct { pkg string // repo-relative package directory - port string // the interface in internal/control it drives + port string // the interface in internal/session/control it drives } // A shell that drives the kernel over HTTP is absent: wire-parity covers it. -// internal/cli is absent for a different reason: with the interactive session +// internal/frontend/cli is absent for a different reason: with the interactive session // gone it is a launcher for serve and one-shot run, not a surface a person // operates a session through, so a capability it does not drive is not debt. var frontendPorts = []frontendPort{ - {pkg: "internal/acp", port: "EditorAPI"}, - {pkg: "internal/serve", port: "SessionAPI"}, + {pkg: "internal/frontend/acp", port: "EditorAPI"}, + {pkg: "internal/frontend/serve", port: "SessionAPI"}, } // frontendScope excuses one capability a frontend's port declares and that it diff --git a/tools/repolint/frontendparity_test.go b/tools/repolint/frontendparity_test.go index 83724af3e3..89317153c5 100644 --- a/tools/repolint/frontendparity_test.go +++ b/tools/repolint/frontendparity_test.go @@ -9,15 +9,15 @@ import ( // on a narrower composite, so a capability can be out of reach for a reason // port.go already compiles. var testPorts = []frontendPort{ - {pkg: "internal/acp", port: "EditorAPI"}, - {pkg: "internal/cli", port: "SessionAPI"}, - {pkg: "internal/serve", port: "SessionAPI"}, + {pkg: "internal/frontend/acp", port: "EditorAPI"}, + {pkg: "internal/frontend/cli", port: "SessionAPI"}, + {pkg: "internal/frontend/serve", port: "SessionAPI"}, } const ( - acpPkg = "internal/acp" - cliPkg = "internal/cli" - servePkg = "internal/serve" + acpPkg = "internal/frontend/acp" + cliPkg = "internal/frontend/cli" + servePkg = "internal/frontend/serve" ) // parityOf builds what the type check would have produced: capabilities the @@ -26,7 +26,7 @@ const ( func parityOf(caps []string, reachable, consumed map[string][]string) parityMatrix { m := parityMatrix{reachable: map[string]map[string]bool{}, consumed: map[string]map[string]bool{}} for i, name := range caps { - m.capabilities = append(m.capabilities, capability{name, "internal/control/controller.go", i + 1}) + m.capabilities = append(m.capabilities, capability{name, "internal/session/control/controller.go", i + 1}) } for pkg, names := range reachable { m.reachable[pkg] = nameSet(names) @@ -184,9 +184,9 @@ func TestScopeRowsReportAtTheTable(t *testing.T) { } func TestRecordedParityDebtDoesNotFail(t *testing.T) { - b := budget(map[string]map[string]int{"internal/control/controller.go": {ruleFrontendParity: 3}}, + b := budget(map[string]map[string]int{"internal/session/control/controller.go": {ruleFrontendParity: 3}}, map[string]int{ruleFrontendParity: 3}) - _, msgs := b.exceeded([]Finding{{"internal/control/controller.go", 1, ruleFrontendParity, "", 3}}) + _, msgs := b.exceeded([]Finding{{"internal/session/control/controller.go", 1, ruleFrontendParity, "", 3}}) if len(msgs) != 0 { t.Fatalf("baselined parity debt reported as new: %v", msgs) } @@ -195,9 +195,9 @@ func TestRecordedParityDebtDoesNotFail(t *testing.T) { // The gate's whole purpose: a capability that gains a frontend it does not // reach must fail, even though the capability's row already existed. func TestOneMoreMissingEdgeOnAnAlreadyBaselinedCapabilityFails(t *testing.T) { - b := budget(map[string]map[string]int{"internal/control/controller.go": {ruleFrontendParity: 3}}, + b := budget(map[string]map[string]int{"internal/session/control/controller.go": {ruleFrontendParity: 3}}, map[string]int{ruleFrontendParity: 3}) - _, msgs := b.exceeded([]Finding{{"internal/control/controller.go", 1, ruleFrontendParity, "", 4}}) + _, msgs := b.exceeded([]Finding{{"internal/session/control/controller.go", 1, ruleFrontendParity, "", 4}}) if len(msgs) == 0 { t.Fatal("a fourth missing edge under a budget of three must fail") } @@ -206,7 +206,7 @@ func TestOneMoreMissingEdgeOnAnAlreadyBaselinedCapabilityFails(t *testing.T) { func TestANewCapabilityWiredToOneFrontendFails(t *testing.T) { b := budget(map[string]map[string]int{}, map[string]int{ruleFrontendParity: 0}) over, msgs := b.exceeded([]Finding{ - {"internal/control/goal.go", 12, ruleFrontendParity, "Controller.SetGoal: acp=no cli=yes serve=no", 2}}) + {"internal/session/control/goal.go", 12, ruleFrontendParity, "Controller.SetGoal: acp=no cli=yes serve=no", 2}}) if len(msgs) == 0 || len(over) != 1 { t.Fatalf("a capability landing in an unbaselined file must fail: over=%v msgs=%v", over, msgs) } @@ -215,9 +215,9 @@ func TestANewCapabilityWiredToOneFrontendFails(t *testing.T) { // Wiring a frontend pays debt down, and the surplus has to be reported: budget // left on a file is room the gap can reopen into without anyone noticing. func TestWiringAFrontendLeavesReclaimableBudget(t *testing.T) { - b := budget(map[string]map[string]int{"internal/control/controller.go": {ruleFrontendParity: 3}}, + b := budget(map[string]map[string]int{"internal/session/control/controller.go": {ruleFrontendParity: 3}}, map[string]int{ruleFrontendParity: 3}) - paid := []Finding{{"internal/control/controller.go", 1, ruleFrontendParity, "", 2}} + paid := []Finding{{"internal/session/control/controller.go", 1, ruleFrontendParity, "", 2}} if slack := reclaimable(b, paid); slack[ruleFrontendParity] != 1 { t.Fatalf("paying one edge must free one unit of budget: %v", slack) } @@ -231,9 +231,9 @@ func TestWiringAFrontendLeavesReclaimableBudget(t *testing.T) { } func TestRaisingTheParityCeilingIsRefusedWithoutAllowWiden(t *testing.T) { - b := budget(map[string]map[string]int{"internal/control/controller.go": {ruleFrontendParity: 2}}, + b := budget(map[string]map[string]int{"internal/session/control/controller.go": {ruleFrontendParity: 2}}, map[string]int{ruleFrontendParity: 2}) - next := baselineFrom([]Finding{{"internal/control/controller.go", 1, ruleFrontendParity, "", 3}}) + next := baselineFrom([]Finding{{"internal/session/control/controller.go", 1, ruleFrontendParity, "", 3}}) if w := widenings(b, next); len(w) == 0 { t.Fatal("carrying a new missing edge into the baseline must be asked for") } diff --git a/tools/repolint/frontendtypes.go b/tools/repolint/frontendtypes.go index ce000ae861..f4c47b8917 100644 --- a/tools/repolint/frontendtypes.go +++ b/tools/repolint/frontendtypes.go @@ -17,13 +17,13 @@ import ( ) const ( - controlPkgPath = "reasonix/internal/control" + controlPkgPath = "reasonix/internal/session/control" controllerName = "Controller" modulePath = "reasonix" ) // One declared build target keeps the matrix off the machine that reads it: -// internal/cli carries _windows and _unix files, and a GOOS-dependent file set +// internal/frontend/cli carries _windows and _unix files, and a GOOS-dependent file set // would put a developer's baseline at odds with CI. This is the CLI's own // release configuration, so the tree has to keep it building anyway. var parityTarget = []string{"CGO_ENABLED=0", "GOOS=linux", "GOARCH=amd64"} diff --git a/tools/repolint/inboxrefusal.go b/tools/repolint/inboxrefusal.go index fa7fd74086..262ef50e2a 100644 --- a/tools/repolint/inboxrefusal.go +++ b/tools/repolint/inboxrefusal.go @@ -14,8 +14,8 @@ import ( // the kernel, and no spelling tells the writer that carries an identity from // one that carries a sentence. const ( - inboxFamilyFile = "internal/sessioninbox/types.go" - inboxWriterFile = "internal/serve/inbox.go" + inboxFamilyFile = "internal/state/sessioninbox/types.go" + inboxWriterFile = "internal/frontend/serve/inbox.go" inboxWriterFunc = "writeInboxError" ) diff --git a/tools/repolint/layer_order.go b/tools/repolint/layer_order.go new file mode 100644 index 0000000000..d68fac6c40 --- /dev/null +++ b/tools/repolint/layer_order.go @@ -0,0 +1,74 @@ +// layer_order.go — the kernel's layers, read from where a package lives. +// +// A package's layer is the directory it sits in under internal/, so where a +// package is kept is its declaration: moving it is the one way to change what it +// may depend on, and a reader sees the layer before opening a file. A package +// may import its own layer and any layer below; the subsystem directories share +// one layer. What sits above internal/ — cmd, desktop, benchmarks, tools — are +// hosts and assemble everything. +package main + +import ( + "fmt" + "path" + "strings" +) + +const ruleLayerOrder = "layer-order" + +// layerRank orders the directories under internal/. Equal ranks may import each +// other: the subsystems are peers. +var layerRank = map[string]int{ + "base": 0, + "contract": 1, + "model": 2, + "tools": 2, + "safety": 2, + "ext": 2, + "state": 2, + "platform": 2, + "runtime": 3, + "session": 4, + "assembly": 5, + "frontend": 6, +} + +// layerOf names the layer directory a package lives in, or "" for one outside +// internal/. +func layerOf(pkg string) (string, bool) { + rest, ok := strings.CutPrefix(pkg, "internal/") + if !ok { + return "", false + } + layer, _, _ := strings.Cut(rest, "/") + return layer, true +} + +func checkLayerOrder(imports map[string][]importRef) []Finding { + var out []Finding + for _, rel := range sortedKeys(imports) { + pkg := path.Dir(rel) + layer, inside := layerOf(pkg) + if !inside { + continue + } + rank, known := layerRank[layer] + if !known { + out = append(out, Finding{rel, 1, ruleLayerOrder, fmt.Sprintf("%s is not in a layer directory; kernel packages live under internal//", pkg), 1}) + continue + } + for _, ref := range imports[rel] { + dep, ok := strings.CutPrefix(ref.path, modulePrefix) + if !ok { + continue + } + depLayer, inside := layerOf(dep) + if !inside || layerRank[depLayer] <= rank { + continue + } + out = append(out, Finding{rel, ref.line, ruleLayerOrder, + fmt.Sprintf("%s (%s) may not import %s (%s): a layer depends only on itself and the layers below it", pkg, layer, dep, depLayer), 1}) + } + } + return out +} diff --git a/tools/repolint/layer_order_test.go b/tools/repolint/layer_order_test.go new file mode 100644 index 0000000000..9a754be8bf --- /dev/null +++ b/tools/repolint/layer_order_test.go @@ -0,0 +1,39 @@ +package main + +import ( + "strings" + "testing" +) + +func TestLayerOrderAllowsOnlyDownwardAndPeerImports(t *testing.T) { + imports := map[string][]importRef{ + "internal/runtime/agent/a.go": { + {path: "reasonix/internal/contract/provider", line: 3}, + {path: "reasonix/internal/safety/sandbox", line: 4}, + {path: "reasonix/internal/session/control", line: 5}, + }, + "internal/tools/builtin/b.go": { + {path: "reasonix/internal/safety/sandbox", line: 3}, + {path: "fmt", line: 4}, + }, + "internal/contract/event/e.go": {{path: "reasonix/internal/model/billing", line: 7}}, + "internal/stray/x.go": {{path: "reasonix/internal/base/fileutil", line: 2}}, + "cmd/tool/main.go": {{path: "reasonix/internal/frontend/cli", line: 2}}, + } + got := map[string]string{} + for _, f := range checkLayerOrder(imports) { + got[f.File] = f.Msg + } + if len(got) != 3 { + t.Fatalf("findings = %v, want the upward import from runtime, the one from contract, and the stray package", got) + } + if !strings.Contains(got["internal/runtime/agent/a.go"], "internal/session/control (session)") { + t.Errorf("runtime → session: %q", got["internal/runtime/agent/a.go"]) + } + if !strings.Contains(got["internal/contract/event/e.go"], "internal/model/billing (model)") { + t.Errorf("contract → model: %q", got["internal/contract/event/e.go"]) + } + if !strings.Contains(got["internal/stray/x.go"], "not in a layer directory") { + t.Errorf("stray package: %q", got["internal/stray/x.go"]) + } +} diff --git a/tools/repolint/layers.go b/tools/repolint/layers.go index 162e6befa9..0b721a10bf 100644 --- a/tools/repolint/layers.go +++ b/tools/repolint/layers.go @@ -11,10 +11,10 @@ const modulePrefix = "reasonix/" // Transport-agnostic control.Controller sits behind every frontend; nothing // below it may reach up. See REASONIX.md. var frontends = []string{ - "internal/acp", - "internal/boot", - "internal/cli", - "internal/serve", + "internal/frontend/acp", + "internal/assembly/boot", + "internal/frontend/cli", + "internal/frontend/serve", } // Utility layer: these packages carry no knowledge of the kernel and must @@ -22,42 +22,42 @@ var frontends = []string{ // One may reach another: the layer is closed, so that drags nothing in, and // refusing it is what leaves the same judgement copied into several of them. var leaves = []string{ - "internal/ablation", - "internal/agentgraph", - "internal/agentpreset", - "internal/billing", - "internal/browser", - "internal/computer", - "internal/diff", - "internal/extension/rpcwire", - "internal/execgraph", - "internal/execjournal", - "internal/extensioncontract", - "internal/filelock", - "internal/fileref", - "internal/fileutil", - "internal/fileutil/encoding", - "internal/frontmatter", - "internal/i18n", - "internal/mcpdiag", - "internal/neterr", - "internal/nilutil", - "internal/packagegrant", - "internal/planmode", - "internal/proc", - "internal/redirectguard", - "internal/releaseasset", - "internal/retrieval", - "internal/shellparse", - "internal/store", - "internal/surface", - "internal/sysproxy", - "internal/textutil", - "internal/tokencount", - "internal/usagereport", - "internal/visionimage", - "internal/workspaceid", - "internal/workspacelease", + "internal/contract/ablation", + "internal/contract/agentgraph", + "internal/contract/agentpreset", + "internal/model/billing", + "internal/platform/browser", + "internal/platform/computer", + "internal/base/diff", + "internal/ext/extension/rpcwire", + "internal/state/execgraph", + "internal/state/execjournal", + "internal/ext/extensioncontract", + "internal/base/filelock", + "internal/base/fileref", + "internal/base/fileutil", + "internal/base/fileutil/encoding", + "internal/base/frontmatter", + "internal/base/i18n", + "internal/ext/mcpdiag", + "internal/base/neterr", + "internal/base/nilutil", + "internal/platform/packagegrant", + "internal/contract/planmode", + "internal/base/proc", + "internal/safety/redirectguard", + "internal/platform/releaseasset", + "internal/base/retrieval", + "internal/base/shellparse", + "internal/state/store", + "internal/contract/surface", + "internal/base/sysproxy", + "internal/base/textutil", + "internal/base/tokencount", + "internal/state/usagereport", + "internal/model/visionimage", + "internal/base/workspaceid", + "internal/state/workspacelease", } // A host adapter implements a frontend's driven port and is shared by the hosts @@ -66,7 +66,7 @@ var leaves = []string{ // assembles one. remotehost holds the machines a Studio opens a workspace on — // the connection, not the window — so neither shell owns it. var hostAdapters = []string{ - "internal/remotehost", + "internal/frontend/remotehost", } func checkLayering(imports map[string][]importRef) []Finding { @@ -90,7 +90,7 @@ func violates(pkg, dep string) string { switch { case matches(leaves, pkg) && !matches(leaves, dep): return fmt.Sprintf("%s is a utility-layer package and must not import %s", pkg, dep) - case under(dep, "internal/control") && !matches(frontends, pkg) && !under(pkg, "internal/control") && !host(pkg): + case under(dep, "internal/session/control") && !matches(frontends, pkg) && !under(pkg, "internal/session/control") && !host(pkg): return fmt.Sprintf("%s may not import %s: the controller is reachable from frontends and entrypoints only", pkg, dep) case matches(frontends, dep) && !above(pkg): return fmt.Sprintf("%s may not import the %s frontend: move shared behavior below the controller", pkg, dep) diff --git a/tools/repolint/layers_test.go b/tools/repolint/layers_test.go index 32d9c4f984..2288463018 100644 --- a/tools/repolint/layers_test.go +++ b/tools/repolint/layers_test.go @@ -7,26 +7,26 @@ func TestLayeringContract(t *testing.T) { name, pkg, dep string wantViolation bool }{ - {"utility package stays a leaf", "internal/fileutil", "internal/config", true}, - {"a utility may use another utility", "internal/fileutil", "internal/textutil", false}, - {"utility package may use the stdlib only", "internal/textutil", "internal/agent", true}, - {"kernel may not reach the controller", "internal/agent", "internal/control", true}, - {"kernel may not reach a frontend", "internal/agent", "internal/cli", true}, - {"diagnostics may not reach the composition root", "internal/capdiag", "internal/boot", true}, - {"frontend may use the controller", "internal/serve", "internal/control", false}, - {"frontend may use another frontend", "internal/cli", "internal/serve", false}, - {"frontend subpackage may use its parent", "internal/serve/hub", "internal/serve", false}, - {"entrypoint may use a frontend", "cmd/reasonix", "internal/cli", false}, - {"desktop host may use the controller", "desktop", "internal/control", false}, - {"controller may use the kernel", "internal/control", "internal/agent", false}, - {"kernel may use a utility package", "internal/agent", "internal/fileutil", false}, - {"host adapter may use the frontend whose port it implements", "internal/remotehost", "internal/serve", false}, - {"host adapter may use the kernel below it", "internal/remotehost", "internal/remote/attach", false}, - {"a host assembles a host adapter", "cmd/reasonix-studio-host", "internal/remotehost", false}, - {"a shell assembles a host adapter", "desktop/next", "internal/remotehost", false}, - {"the kernel may not reach a host adapter", "internal/agent", "internal/remotehost", true}, - {"the controller may not reach a host adapter", "internal/control", "internal/remotehost", true}, - {"a utility may not reach a host adapter", "internal/fileutil", "internal/remotehost", true}, + {"utility package stays a leaf", "internal/base/fileutil", "internal/contract/config", true}, + {"a utility may use another utility", "internal/base/fileutil", "internal/base/textutil", false}, + {"utility package may use the stdlib only", "internal/base/textutil", "internal/runtime/agent", true}, + {"kernel may not reach the controller", "internal/runtime/agent", "internal/session/control", true}, + {"kernel may not reach a frontend", "internal/runtime/agent", "internal/frontend/cli", true}, + {"diagnostics may not reach the composition root", "internal/frontend/capdiag", "internal/assembly/boot", true}, + {"frontend may use the controller", "internal/frontend/serve", "internal/session/control", false}, + {"frontend may use another frontend", "internal/frontend/cli", "internal/frontend/serve", false}, + {"frontend subpackage may use its parent", "internal/frontend/serve/hub", "internal/frontend/serve", false}, + {"entrypoint may use a frontend", "cmd/reasonix", "internal/frontend/cli", false}, + {"desktop host may use the controller", "desktop", "internal/session/control", false}, + {"controller may use the kernel", "internal/session/control", "internal/runtime/agent", false}, + {"kernel may use a utility package", "internal/runtime/agent", "internal/base/fileutil", false}, + {"host adapter may use the frontend whose port it implements", "internal/frontend/remotehost", "internal/frontend/serve", false}, + {"host adapter may use the kernel below it", "internal/frontend/remotehost", "internal/platform/remote/attach", false}, + {"a host assembles a host adapter", "cmd/reasonix-studio-host", "internal/frontend/remotehost", false}, + {"a shell assembles a host adapter", "desktop/next", "internal/frontend/remotehost", false}, + {"the kernel may not reach a host adapter", "internal/runtime/agent", "internal/frontend/remotehost", true}, + {"the controller may not reach a host adapter", "internal/session/control", "internal/frontend/remotehost", true}, + {"a utility may not reach a host adapter", "internal/base/fileutil", "internal/frontend/remotehost", true}, } { t.Run(tc.name, func(t *testing.T) { if got := violates(tc.pkg, tc.dep) != ""; got != tc.wantViolation { @@ -37,8 +37,8 @@ func TestLayeringContract(t *testing.T) { } func TestLayeringReadsImportsFromSource(t *testing.T) { - src := "package agent\n\nimport (\n\t\"fmt\"\n\t\"reasonix/internal/cli\"\n)\n\nvar _ = fmt.Sprint\nvar _ = cli.Run\n" - s := parseBytes("internal/agent/a.go", []byte(src)) + src := "package agent\n\nimport (\n\t\"fmt\"\n\t\"reasonix/internal/frontend/cli\"\n)\n\nvar _ = fmt.Sprint\nvar _ = cli.Run\n" + s := parseBytes("internal/runtime/agent/a.go", []byte(src)) found := checkLayering(map[string][]importRef{s.rel: s.importRefs()}) if len(found) != 1 || found[0].Rule != ruleLayering || found[0].Line != 5 { t.Fatalf("want one %s on line 5, got %+v", ruleLayering, found) @@ -46,8 +46,8 @@ func TestLayeringReadsImportsFromSource(t *testing.T) { } func TestLayeringIgnoresTestFiles(t *testing.T) { - src := "package agent\n\nimport \"reasonix/internal/cli\"\n\nvar _ = cli.Run\n" - s := parseBytes("internal/agent/a_test.go", []byte(src)) + src := "package agent\n\nimport \"reasonix/internal/frontend/cli\"\n\nvar _ = cli.Run\n" + s := parseBytes("internal/runtime/agent/a_test.go", []byte(src)) if refs := s.importRefs(); len(refs) != 0 { t.Fatalf("test file imports should not be layered: %v", refs) } diff --git a/tools/repolint/main.go b/tools/repolint/main.go index 63833b4969..776789b2a0 100644 --- a/tools/repolint/main.go +++ b/tools/repolint/main.go @@ -50,7 +50,7 @@ const ( var allRules = []string{ ruleEssay, ruleBanner, ruleMarker, ruleDeadCode, - ruleNarrative, ruleFileSize, ruleLayering, + ruleNarrative, ruleFileSize, ruleLayering, ruleLayerOrder, ruleFuncSize, ruleComplexity, ruleStructState, ruleRefusalPath, ruleErrorText, ruleClaudeDialect, ruleWireParity, ruleOrphan, ruleFrontendParity, ruleFlatView, ruleBuildArtifact, @@ -196,6 +196,7 @@ func run(root string) ([]Finding, error) { } findings = append(findings, orphans.findings()...) findings = append(findings, checkLayering(imports)...) + findings = append(findings, checkLayerOrder(imports)...) findings = append(findings, checkBuildArtifacts(root)...) findings = append(findings, checkCodeOwners(root)...) findings = append(findings, checkDocs(root)...) diff --git a/tools/repolint/orphan_test.go b/tools/repolint/orphan_test.go index 7f1a55f0ab..c6f05b69d1 100644 --- a/tools/repolint/orphan_test.go +++ b/tools/repolint/orphan_test.go @@ -28,7 +28,7 @@ func names(findings []Finding) string { func TestOrphanReportsExportedKernelFuncWithNoCaller(t *testing.T) { got := orphanFindings(t, map[string]string{ - "internal/repair/config.go": "package repair\nfunc RecordHealthyConfig(v string) error { return nil }\n", + "internal/platform/repair/config.go": "package repair\nfunc RecordHealthyConfig(v string) error { return nil }\n", }) if !strings.Contains(names(got), "RecordHealthyConfig") { t.Fatalf("uncalled exported kernel func not reported: %q", names(got)) @@ -39,8 +39,8 @@ func TestOrphanReportsExportedKernelFuncWithNoCaller(t *testing.T) { // not a caller and must not silence the finding. func TestOrphanIgnoresCommentMentions(t *testing.T) { got := orphanFindings(t, map[string]string{ - "internal/repair/config.go": "package repair\nfunc RecordHealthyConfig(v string) error { return nil }\n", - "internal/config/lkg.go": "package config\n\n// Written by repair.RecordHealthyConfig after a successful boot.\nfunc Path() string { return \"\" }\n", + "internal/platform/repair/config.go": "package repair\nfunc RecordHealthyConfig(v string) error { return nil }\n", + "internal/contract/config/lkg.go": "package config\n\n// Written by repair.RecordHealthyConfig after a successful boot.\nfunc Path() string { return \"\" }\n", }) if !strings.Contains(names(got), "RecordHealthyConfig") { t.Fatal("a comment mention silenced the finding") @@ -50,8 +50,8 @@ func TestOrphanIgnoresCommentMentions(t *testing.T) { // Tests are what keep an orphan green; they are not evidence of a caller. func TestOrphanIgnoresTestCallers(t *testing.T) { got := orphanFindings(t, map[string]string{ - "internal/repair/config.go": "package repair\nfunc RecordHealthyConfig(v string) error { return nil }\n", - "internal/repair/config_test.go": "package repair\nfunc TestX(t *T) { RecordHealthyConfig(\"v\") }\n", + "internal/platform/repair/config.go": "package repair\nfunc RecordHealthyConfig(v string) error { return nil }\n", + "internal/platform/repair/config_test.go": "package repair\nfunc TestX(t *T) { RecordHealthyConfig(\"v\") }\n", }) if !strings.Contains(names(got), "RecordHealthyConfig") { t.Fatal("a test caller silenced the finding") @@ -62,8 +62,8 @@ func TestOrphanIgnoresTestCallers(t *testing.T) { // module would call its APIs dead. func TestOrphanCountsCallersInOtherModules(t *testing.T) { got := orphanFindings(t, map[string]string{ - "internal/repair/config.go": "package repair\nfunc RecordHealthyConfig(v string) error { return nil }\n", - "desktop/next/main.go": "package main\nfunc main() { repair.RecordHealthyConfig(\"1\") }\n", + "internal/platform/repair/config.go": "package repair\nfunc RecordHealthyConfig(v string) error { return nil }\n", + "desktop/next/main.go": "package main\nfunc main() { repair.RecordHealthyConfig(\"1\") }\n", }) if strings.Contains(names(got), "RecordHealthyConfig") { t.Fatalf("a desktop-module caller was not counted: %q", names(got)) @@ -72,8 +72,8 @@ func TestOrphanCountsCallersInOtherModules(t *testing.T) { func TestOrphanSkipsUnexportedAndNonKernel(t *testing.T) { got := orphanFindings(t, map[string]string{ - "internal/repair/config.go": "package repair\nfunc recordHealthy(v string) error { return nil }\n", - "cmd/reasonix/main.go": "package main\nfunc Unused() {}\n", + "internal/platform/repair/config.go": "package repair\nfunc recordHealthy(v string) error { return nil }\n", + "cmd/reasonix/main.go": "package main\nfunc Unused() {}\n", }) if n := names(got); n != "" { t.Fatalf("reported outside the kernel export surface: %q", n) @@ -82,9 +82,9 @@ func TestOrphanSkipsUnexportedAndNonKernel(t *testing.T) { func TestOrphanSkipsTestSupportPackages(t *testing.T) { got := orphanFindings(t, map[string]string{ - "internal/agent/testutil/fake.go": "package testutil\nfunc NewFake() int { return 0 }\n", - "internal/testenv/home.go": "package testenv\nfunc IsolateUserState() {}\n", - "internal/remote/sshtest/s.go": "package sshtest\nfunc Start() {}\n", + "internal/runtime/agent/testutil/fake.go": "package testutil\nfunc NewFake() int { return 0 }\n", + "internal/base/testenv/home.go": "package testenv\nfunc IsolateUserState() {}\n", + "internal/platform/remote/sshtest/s.go": "package sshtest\nfunc Start() {}\n", }) if n := names(got); n != "" { t.Fatalf("reported a test-support package: %q", n) @@ -97,7 +97,7 @@ func TestOrphanSkipsTestSupportPackages(t *testing.T) { // scope: guessing wrong here deletes live code. func TestOrphanSkipsMethods(t *testing.T) { got := orphanFindings(t, map[string]string{ - "internal/cli/tui.go": "package cli\ntype chatTUI struct{}\nfunc (chatTUI) Init() int { return 0 }\nfunc (chatTUI) NeverCalled() {}\n", + "internal/frontend/cli/tui.go": "package cli\ntype chatTUI struct{}\nfunc (chatTUI) Init() int { return 0 }\nfunc (chatTUI) NeverCalled() {}\n", }) if n := names(got); n != "" { t.Fatalf("reported a method: %q", n) @@ -109,8 +109,8 @@ func TestOrphanSkipsMethods(t *testing.T) { // first breaks real tests, which is why the message carries the distinction. func TestOrphanDistinguishesTestFixturesFromCorpses(t *testing.T) { got := orphanFindings(t, map[string]string{ - "internal/repair/update.go": "package repair\nfunc PrepareFileUpdate() {}\nfunc NeverUsed() {}\n", - "internal/repair/update_test.go": "package repair\nfunc TestX(t *T) { PrepareFileUpdate() }\n", + "internal/platform/repair/update.go": "package repair\nfunc PrepareFileUpdate() {}\nfunc NeverUsed() {}\n", + "internal/platform/repair/update_test.go": "package repair\nfunc TestX(t *T) { PrepareFileUpdate() }\n", }) msg := names(got) if !strings.Contains(msg, "PrepareFileUpdate is referenced only by tests") { diff --git a/tools/repolint/refusal.go b/tools/repolint/refusal.go index 947f9b8ee6..702a84f7d3 100644 --- a/tools/repolint/refusal.go +++ b/tools/repolint/refusal.go @@ -12,8 +12,8 @@ import ( // a caller sees a status and a sentence nobody translated — and, before the // transport read plain bodies at all, only the status. const ( - refusalPackage = "internal/serve/" - refusalAdapter = "internal/serve/fail.go" + refusalPackage = "internal/frontend/serve/" + refusalAdapter = "internal/frontend/serve/fail.go" ) // checkRefusalPath flags a refusal that carries no code where the coded one diff --git a/tools/repolint/refusal_test.go b/tools/repolint/refusal_test.go index c92c05408d..e259b09e91 100644 --- a/tools/repolint/refusal_test.go +++ b/tools/repolint/refusal_test.go @@ -24,7 +24,7 @@ func h(w http.ResponseWriter, err error) { ` func TestRefusalPathFlagsPlainHTTPErrorInServe(t *testing.T) { - s := parseBytes("internal/serve/x.go", []byte(refusalSource)) + s := parseBytes("internal/frontend/serve/x.go", []byte(refusalSource)) got := checkRefusalPath(s) if len(got) != 1 { t.Fatalf("findings = %d, want 1: %v", len(got), got) @@ -37,7 +37,7 @@ func TestRefusalPathFlagsPlainHTTPErrorInServe(t *testing.T) { // The rule is about the refusal contract one package owes its frontends, not // about http.Error everywhere: a CLI or a worker has no Reason to send. func TestRefusalPathIgnoresPackagesWithoutThatContract(t *testing.T) { - for _, rel := range []string{"internal/cli/x.go", "internal/serve/x_test.go", "cmd/reasonix/main.go"} { + for _, rel := range []string{"internal/frontend/cli/x.go", "internal/frontend/serve/x_test.go", "cmd/reasonix/main.go"} { if got := checkRefusalPath(parseBytes(rel, []byte(refusalSource))); len(got) != 0 { t.Fatalf("%s was flagged: %v", rel, got) } @@ -50,7 +50,7 @@ func TestRefusalPathExemptsOnlyTheAdapter(t *testing.T) { if got := checkRefusalPath(parseBytes(refusalAdapter, []byte(refusalSource))); len(got) != 0 { t.Fatalf("the adapter was flagged: %v", got) } - for _, rel := range []string{"internal/serve/fail_extra.go", "internal/serve/failure.go", "internal/serve/sub/fail.go"} { + for _, rel := range []string{"internal/frontend/serve/fail_extra.go", "internal/frontend/serve/failure.go", "internal/frontend/serve/sub/fail.go"} { if got := checkRefusalPath(parseBytes(rel, []byte(refusalSource))); len(got) != 1 { t.Fatalf("%s took the adapter's exemption: %v", rel, got) } @@ -61,7 +61,7 @@ func TestRefusalPathExemptsOnlyTheAdapter(t *testing.T) { // same to a frontend whether they arrive as text or as JSON. A body carrying // anything else is a report the panel renders, and stays out of it. func TestRefusalPathFlagsAnErrorOnlyBody(t *testing.T) { - got := checkRefusalPath(parseBytes("internal/serve/x.go", []byte(errorBodySource))) + got := checkRefusalPath(parseBytes("internal/frontend/serve/x.go", []byte(errorBodySource))) if len(got) != 1 { t.Fatalf("findings = %d, want only the error-only body: %v", len(got), got) } diff --git a/tools/repolint/size_test.go b/tools/repolint/size_test.go index 5279c0ff68..ee14c1a37b 100644 --- a/tools/repolint/size_test.go +++ b/tools/repolint/size_test.go @@ -22,9 +22,9 @@ func TestSizeRuleCoversTypeScript(t *testing.T) { {"tsx under the ceiling", "desktop/frontend/src/components/Small.tsx", linesOf(100), ""}, {"front-end test dir is exempt", "desktop/frontend/src/__tests__/big.test.ts", linesOf(900), ""}, {"spec suffix is exempt", "desktop/frontend/src/lib/big.spec.ts", linesOf(900), ""}, - {"go test file is exempt", "internal/agent/big_test.go", goLinesOf(900), ""}, + {"go test file is exempt", "internal/runtime/agent/big_test.go", goLinesOf(900), ""}, {"worker ts", "workers/crash-report/src/big.ts", linesOf(900), ruleFileSize}, - {"go file keeps its rule", "internal/agent/big.go", goLinesOf(900), ruleFileSize}, + {"go file keeps its rule", "internal/runtime/agent/big.go", goLinesOf(900), ruleFileSize}, {"locale table is exempt", "desktop/frontend-next/src/i18n/en.ts", linesOf(3000), ""}, } { t.Run(tc.name, func(t *testing.T) { diff --git a/tools/repolint/source_test.go b/tools/repolint/source_test.go index 077d2c8a15..30d3d6af1c 100644 --- a/tools/repolint/source_test.go +++ b/tools/repolint/source_test.go @@ -6,7 +6,7 @@ import ( "slices" "testing" - "reasonix/internal/testenv" + "reasonix/internal/base/testenv" ) // A build product is gitignored and regenerated, so its size is neither @@ -27,7 +27,7 @@ func TestGeneratedOutputIsNotCollected(t *testing.T) { } write("desktop/frontend/dist/models.js", "export class X {}\n") write("desktop/frontend/src/app.ts", "export const x = 1\n") - write("internal/agent/agent.go", "package agent\n") + write("internal/runtime/agent/agent.go", "package agent\n") got, err := collect(root) if err != nil { @@ -38,7 +38,7 @@ func TestGeneratedOutputIsNotCollected(t *testing.T) { t.Fatalf("generated output was collected: %v", got) } } - for _, want := range []string{"desktop/frontend/src/app.ts", "internal/agent/agent.go"} { + for _, want := range []string{"desktop/frontend/src/app.ts", "internal/runtime/agent/agent.go"} { if !slices.ContainsFunc(got, func(rel string) bool { return filepath.ToSlash(rel) == want }) { t.Errorf("%s was skipped; only generated output should be", want) } diff --git a/tools/repolint/tagparity.go b/tools/repolint/tagparity.go index ec335b4b16..5baef61f51 100644 --- a/tools/repolint/tagparity.go +++ b/tools/repolint/tagparity.go @@ -14,7 +14,7 @@ import ( // a transcript from /history and must not print host markup as if a person had // typed it. const ( - goTagFile = "internal/agent/preview.go" + goTagFile = "internal/runtime/agent/preview.go" tsTagFile = "desktop/frontend-next/src/state/session.ts" ) diff --git a/tools/repolint/wireparity.go b/tools/repolint/wireparity.go index c136ee70e1..fa1f06ad38 100644 --- a/tools/repolint/wireparity.go +++ b/tools/repolint/wireparity.go @@ -29,80 +29,80 @@ const ( // wrong. Declared and not inferred, for the reason the sensitive paths are: no // spelling tells a mirrored contract from a struct with json tags. var mirroredWireTypes = []wireMirror{ - {"internal/agentgraph/graph.go", "Node", tsWireFile, "GraphNode"}, - {"internal/agentgraph/graph.go", "Edge", tsWireFile, "GraphEdge"}, - {"internal/agentgraph/graph.go", "Delta", tsWireFile, "GraphDelta"}, + {"internal/contract/agentgraph/graph.go", "Node", tsWireFile, "GraphNode"}, + {"internal/contract/agentgraph/graph.go", "Edge", tsWireFile, "GraphEdge"}, + {"internal/contract/agentgraph/graph.go", "Delta", tsWireFile, "GraphDelta"}, // The snapshot is the execution model's whole authority: no delta carries an // interruption or an unrecorded identity, and a watermark the page cannot // find is a bootstrap that resumes from zero. - {"internal/agentgraph/graph.go", "Graph", tsWireFile, "ExecutionGraph"}, - {"internal/control/execution_graph.go", "ExecutionGraphSnapshot", tsWireFile, "ExecutionGraphSnapshot"}, - {"internal/control/execution_graph.go", "ExecutionInterruption", tsWireFile, "ExecutionInterruption"}, - {"internal/serve/executiongraph.go", "executionGraphView", tsWireFile, "ExecutionGraphView"}, + {"internal/contract/agentgraph/graph.go", "Graph", tsWireFile, "ExecutionGraph"}, + {"internal/session/control/execution_graph.go", "ExecutionGraphSnapshot", tsWireFile, "ExecutionGraphSnapshot"}, + {"internal/session/control/execution_graph.go", "ExecutionInterruption", tsWireFile, "ExecutionInterruption"}, + {"internal/frontend/serve/executiongraph.go", "executionGraphView", tsWireFile, "ExecutionGraphView"}, // Whether a replayed trajectory covers the session or only a prefix of it. // A page that cannot read the coverage is back to the empty array that meant // three different things. - {"internal/serve/wirelog.go", "trajectoryView", tsWireFile, "TrajectoryRead"}, + {"internal/frontend/serve/wirelog.go", "trajectoryView", tsWireFile, "TrajectoryRead"}, // The tool frame itself. Who issued a call is the one thing separating the // model's work from the host's own bookkeeping, and a page that cannot read // it folds them together. - {"internal/eventwire/wire.go", "Tool", tsWireFile, "Tool"}, + {"internal/contract/eventwire/wire.go", "Tool", tsWireFile, "Tool"}, // The canonical task list, which the panel reads rather than derives. A // status the page cannot read is a signed-off step drawn as the current one. - {"internal/serve/todos.go", "todoItem", tsSessionFile, "HostTodo"}, + {"internal/frontend/serve/todos.go", "todoItem", tsSessionFile, "HostTodo"}, // The agent's tabs. The target id is what the window draws a view by, so a // tab the page cannot read one for is a tab it cannot show. - {"internal/browser/session.go", "TabInfo", tsSessionFile, "BrowserTab"}, + {"internal/platform/browser/session.go", "TabInfo", tsSessionFile, "BrowserTab"}, // A rebuilt transcript's tool calls. The proxy's resolved identity was on // the kernel side and not on this one, so a reopened session drew // use_capability where the live one drew what it reached. - {"internal/serve/history.go", "historyToolCall", tsSessionFile, "HistoryToolCall"}, - {"internal/control/boundary.go", "SandboxSettings", tsBoundaryFile, "SandboxSettings"}, + {"internal/frontend/serve/history.go", "historyToolCall", tsSessionFile, "HistoryToolCall"}, + {"internal/session/control/boundary.go", "SandboxSettings", tsBoundaryFile, "SandboxSettings"}, // The MCP row: a status the host answered with and the page cannot read is a // row that goes back to reading the server's own prose for it. - {"internal/serve/catalog.go", "mcpEntry", tsMcpFile, "McpEntry"}, + {"internal/frontend/serve/catalog.go", "mcpEntry", tsMcpFile, "McpEntry"}, // The fold bounds and the one in force: a field the panel cannot read is a // threshold a user sets and never sees applied. - {"internal/control/compaction_settings.go", "CompactionSettings", tsModelFile, "CompactionSettings"}, + {"internal/session/control/compaction_settings.go", "CompactionSettings", tsModelFile, "CompactionSettings"}, // The completion summary is the turn's own verdict on itself; a gap kind the // desktop cannot read is a turn it shows as clean. - {"internal/eventwire/wire.go", "CompletionSummary", tsWireFile, "CompletionSummary"}, + {"internal/contract/eventwire/wire.go", "CompletionSummary", tsWireFile, "CompletionSummary"}, // A maintenance verdict the desktop cannot read is a session that shows no // attempt to bound its context — which is what its trajectory export said // about the run that motivated the second boundary. - {"internal/eventwire/wire.go", "ContextMaintenance", tsWireFile, "ContextMaintenance"}, + {"internal/contract/eventwire/wire.go", "ContextMaintenance", tsWireFile, "ContextMaintenance"}, // The gauge and the two ceilings behind it. A panel that cannot read which // bound fires draws a fold point at 16% of the declared window with nothing // on the screen that explains it, which is what it read as. - {"internal/serve/context_window.go", "contextView", tsShellFile, "ContextBreakdown"}, + {"internal/frontend/serve/context_window.go", "contextView", tsShellFile, "ContextBreakdown"}, // What sent one fold. Without the boundary and its size the card falls back // to "a threshold was reached", and the reader supplies their own reason. - {"internal/eventwire/wire.go", "Compaction", tsWireFile, "Compaction"}, + {"internal/contract/eventwire/wire.go", "Compaction", tsWireFile, "Compaction"}, // Plan rewriting and plan advancement are told apart by three counters; a // desktop that can read only some of them reads churn as work. - {"internal/eventwire/wire.go", "TodoProgress", tsWireFile, "TodoProgress"}, + {"internal/contract/eventwire/wire.go", "TodoProgress", tsWireFile, "TodoProgress"}, // RemoteHostEdit is left out on purpose: the kernel still takes the single // `workspace` an old row was saved with, which the page deliberately does // not send. An under-filled request is not a picture that cannot be read. - {"internal/serve/hub_remote.go", "RemoteHostView", tsRemoteFile, "RemoteHost"}, - {"internal/serve/remote_browse.go", "RemoteListing", tsRemoteFile, "RemoteListing"}, - {"internal/serve/remote_browse.go", "RemoteFolder", tsRemoteFile, "RemoteFolder"}, + {"internal/frontend/serve/hub_remote.go", "RemoteHostView", tsRemoteFile, "RemoteHost"}, + {"internal/frontend/serve/remote_browse.go", "RemoteListing", tsRemoteFile, "RemoteListing"}, + {"internal/frontend/serve/remote_browse.go", "RemoteFolder", tsRemoteFile, "RemoteFolder"}, // What waits on the user, and which call answers it. The desktop reads this // list as the whole set of open prompts — one it cannot read is a card it // seals as decided while the run stays blocked on it. - {"internal/control/decisions.go", "Decision", tsSessionFile, "Decision"}, - {"internal/control/decisions.go", "DecisionQuestion", tsSessionFile, "DecisionQuestion"}, - {"internal/control/decisions.go", "DecisionOption", tsSessionFile, "DecisionOption"}, + {"internal/session/control/decisions.go", "Decision", tsSessionFile, "Decision"}, + {"internal/session/control/decisions.go", "DecisionQuestion", tsSessionFile, "DecisionQuestion"}, + {"internal/session/control/decisions.go", "DecisionOption", tsSessionFile, "DecisionOption"}, // How a window learns a prompt was answered in another one. A field it // cannot read is a card left answerable over a decision already made. - {"internal/eventwire/wire.go", "DecisionReceipt", tsWireFile, "DecisionReceipt"}, + {"internal/contract/eventwire/wire.go", "DecisionReceipt", tsWireFile, "DecisionReceipt"}, // What an install in flight is doing. The page polls it and renders one // sentence per phase; a phase it cannot read renders as nothing, which on // the long pause after the last byte is indistinguishable from a hang. - {"internal/update/progress.go", "Progress", tsVersionFile, "UpdateProgress"}, - {"internal/checkpoint/types.go", "RewindResult", tsSessionFile, "RewindResult"}, - {"internal/eventwire/wire.go", "ShellExecution", tsWireFile, "Execution"}, - {"internal/eventwire/workspace_lease.go", "WorkspaceLease", tsWireFile, "WorkspaceLease"}, + {"internal/platform/update/progress.go", "Progress", tsVersionFile, "UpdateProgress"}, + {"internal/state/checkpoint/types.go", "RewindResult", tsSessionFile, "RewindResult"}, + {"internal/contract/eventwire/wire.go", "ShellExecution", tsWireFile, "Execution"}, + {"internal/contract/eventwire/workspace_lease.go", "WorkspaceLease", tsWireFile, "WorkspaceLease"}, } type wireMirror struct { @@ -115,7 +115,7 @@ type wireMirror struct { // name the reader declares and the writer never sends reads as zero forever, // which is what a rename on the writing side looks like from here. var readMirrors = []readMirror{ - {"cmd/e2ebench/main.go", "runMetrics", "internal/cli/run_metrics.go", "RunMetrics"}, + {"cmd/e2ebench/main.go", "runMetrics", "internal/frontend/cli/run_metrics.go", "RunMetrics"}, } type readMirror struct { diff --git a/tools/trajectory/README.md b/tools/trajectory/README.md index 0e17c29a78..096d8316b5 100644 --- a/tools/trajectory/README.md +++ b/tools/trajectory/README.md @@ -33,9 +33,9 @@ does, and version 1 means exactly these: | definition | where it lives | | --- | --- | -| `ClassifyTodoTransition` — the six verdicts and how they are read | `internal/evidence/todo_progress.go` @ 2d379d411 | -| `stepIdentity` — stable id, else normalized text, never position | `internal/evidence/todo_progress.go` @ 2d379d411 | -| what advances a progress revision | `internal/agent/todo_progress_shadow.go` @ 2d379d411 | +| `ClassifyTodoTransition` — the six verdicts and how they are read | `internal/runtime/evidence/todo_progress.go` @ 2d379d411 | +| `stepIdentity` — stable id, else normalized text, never position | `internal/runtime/evidence/todo_progress.go` @ 2d379d411 | +| what advances a progress revision | `internal/runtime/agent/todo_progress_shadow.go` @ 2d379d411 | | gap arithmetic — measured from the previous advance | `progress_corpus.py` @ 92d7e37de | | episode segmentation — the three resolving kinds, censored tail | `progress_corpus.py` @ 92d7e37de | diff --git a/tools/workgroupassay/README.md b/tools/workgroupassay/README.md index 832a65a35e..ac96b81029 100644 --- a/tools/workgroupassay/README.md +++ b/tools/workgroupassay/README.md @@ -43,7 +43,7 @@ verdict**. Raw trajectory, task list and result: It cost ¥2.13 and its most durable result was not a number: on its ninth turn it broke an invariant ten fixtures had agreed held, because a `Partial=true` dispatch is a transport statement and not a promise that a completion frame -follows. See `internal/workgroup`. +follows. See `internal/state/workgroup`. ## The verdict diff --git a/tools/workgroupassay/assay_test.go b/tools/workgroupassay/assay_test.go index 9689187a5c..29f8db4caa 100644 --- a/tools/workgroupassay/assay_test.go +++ b/tools/workgroupassay/assay_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "reasonix/internal/config" - "reasonix/internal/event" - "reasonix/internal/eventwire" - "reasonix/internal/workgroup" + "reasonix/internal/contract/config" + "reasonix/internal/contract/event" + "reasonix/internal/contract/eventwire" + "reasonix/internal/state/workgroup" ) func toolFrame(id string, issuer event.ToolIssuer, kind string) eventwire.Event { diff --git a/tools/workgroupassay/main.go b/tools/workgroupassay/main.go index 38f5cbd3d4..f90a1204e8 100644 --- a/tools/workgroupassay/main.go +++ b/tools/workgroupassay/main.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "reasonix/internal/config" - "reasonix/internal/eventwire" + "reasonix/internal/contract/config" + "reasonix/internal/contract/eventwire" ) // turn is one authored turn: the frames it owns and where in time it sits. diff --git a/tools/workgroupassay/measure.go b/tools/workgroupassay/measure.go index fd320f07a8..b28f7bb908 100644 --- a/tools/workgroupassay/measure.go +++ b/tools/workgroupassay/measure.go @@ -5,8 +5,8 @@ import ( "slices" "strings" - "reasonix/internal/event" - "reasonix/internal/workgroup" + "reasonix/internal/contract/event" + "reasonix/internal/state/workgroup" ) // assay is the five numbers the protocol asks for plus the two breakdowns that diff --git a/tools/write_heartbeat/main.go b/tools/write_heartbeat/main.go index 20fdcf62b4..12a58e2f30 100644 --- a/tools/write_heartbeat/main.go +++ b/tools/write_heartbeat/main.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - "reasonix/internal/config" - fileencoding "reasonix/internal/fileutil/encoding" + fileencoding "reasonix/internal/base/fileutil/encoding" + "reasonix/internal/contract/config" ) type Task struct { diff --git a/workers/crash-report/src/registry/lib/validation.ts b/workers/crash-report/src/registry/lib/validation.ts index 4989d16fbf..a140bd643c 100644 --- a/workers/crash-report/src/registry/lib/validation.ts +++ b/workers/crash-report/src/registry/lib/validation.ts @@ -16,7 +16,7 @@ const httpUrl = z.string().trim().url().max(500); // A publishable install source. The registry stores only a pointer; the real // install runs client-side through install_source, so a source it cannot -// classify is dead on arrival. These mirror internal/installsource/names.go +// classify is dead on arrival. These mirror internal/ext/installsource/names.go // (isURL || git: shorthand || looksLikePackage); a bare local path is refused // because it resolves on the publisher's machine, never the installer's. const pkgSegment = /^[a-zA-Z0-9._-]+$/;