orkeon-code 1.0.0-rc.1 → 1.0.0-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.orkeon-runtime +11 -0
- package/.orkeon-version +1 -1
- package/NOTICE.md +1 -1
- package/README.fr.md +16 -22
- package/README.md +16 -22
- package/config/appsettings.jev.example.json +4 -1
- package/config/appsettings.kev.example.json +4 -1
- package/config/appsettings.liquid.example.json +4 -1
- package/config/appsettings.ollama-whisper.example.json +1 -0
- package/config/appsettings.whisper.example.json +1 -0
- package/mcp/whisper/README.md +2 -1
- package/orkeon-code +508 -80
- package/orkeon-code.ps1 +129 -11
- package/package.json +3 -1
- package/scripts/dev-run.sh +139 -0
- package/src/commands/.orkeon/orkeon-cli.d.ts +1 -4
- package/src/commands/_lib/args.ts +5 -4
- package/src/commands/_lib/dev/dev-batches.ts +34 -36
- package/src/commands/_lib/dev/dev-implement.ts +11 -14
- package/src/commands/_lib/dev/dev-source.ts +7 -11
- package/src/commands/_lib/dev/dev.ts +34 -37
- package/src/commands/_lib/dev/markers.ts +7 -0
- package/src/commands/_lib/dev/messages.ts +112 -0
- package/src/commands/_lib/dev-step.ts +16 -13
- package/src/commands/_lib/dispatch.ts +62 -39
- package/src/commands/_lib/git/branch.ts +9 -10
- package/src/commands/_lib/git/commit.ts +9 -13
- package/src/commands/_lib/git/diff.ts +22 -12
- package/src/commands/_lib/git/messages.ts +54 -0
- package/src/commands/_lib/git/review.ts +9 -10
- package/src/commands/_lib/memory/memory-admit.ts +19 -21
- package/src/commands/_lib/memory/memory.ts +3 -2
- package/src/commands/_lib/memory/messages.ts +32 -0
- package/src/commands/_lib/messages.ts +48 -0
- package/src/commands/_lib/project/messages.ts +8 -0
- package/src/commands/_lib/session/export.ts +3 -2
- package/src/commands/_lib/session/messages.ts +87 -0
- package/src/commands/_lib/session/prompts.ts +4 -0
- package/src/commands/_lib/session/resume.ts +15 -24
- package/src/commands/_lib/session/tasks.ts +20 -23
- package/src/commands/_lib/settings/advisor.ts +11 -16
- package/src/commands/_lib/settings/agents.ts +18 -28
- package/src/commands/_lib/settings/choices.ts +8 -0
- package/src/commands/_lib/settings/config.ts +43 -43
- package/src/commands/_lib/settings/effort.ts +147 -0
- package/src/commands/_lib/settings/hooks.ts +12 -20
- package/src/commands/_lib/settings/messages.ts +408 -0
- package/src/commands/_lib/settings/mode.ts +33 -24
- package/src/commands/_lib/settings/model.ts +71 -36
- package/src/commands/_lib/settings/output-style.ts +39 -0
- package/src/commands/_lib/settings/permissions.ts +71 -93
- package/src/commands/_lib/settings/route.ts +63 -0
- package/src/commands/_lib/settings/skills.ts +53 -11
- package/src/commands/_lib/settings/theme.ts +42 -0
- package/src/commands/_lib/speech/messages.ts +58 -0
- package/src/commands/_lib/speech/prompts.ts +4 -0
- package/src/commands/_lib/speech/say.ts +9 -10
- package/src/commands/_lib/speech/transcribe.ts +14 -23
- package/src/commands/_lib/speech/voice.ts +14 -18
- package/src/commands/_lib/status/doctor.ts +47 -28
- package/src/commands/_lib/status/messages.ts +101 -0
- package/src/commands/_lib/status/meta.ts +5 -25
- package/src/commands/_lib/status/status.ts +10 -11
- package/src/commands/_lib/status/usage-tools.ts +2 -3
- package/src/commands/_lib/status/usage.ts +7 -18
- package/src/commands/_lib/view.ts +6 -1
- package/src/commands/dev/dev-batches.cmd.ts +4 -3
- package/src/commands/dev/dev-learn.cmd.ts +3 -3
- package/src/commands/dev/dev-plan.cmd.ts +6 -7
- package/src/commands/dev/dev-spec.cmd.ts +6 -7
- package/src/commands/git/commit.cmd.ts +3 -3
- package/src/commands/git/review.cmd.ts +3 -3
- package/src/commands/memory/memory.cmd.ts +2 -2
- package/src/commands/project/analyze.cmd.ts +3 -3
- package/src/commands/project/debug-tool-call.cmd.ts +4 -9
- package/src/commands/project/init-verifiers.cmd.ts +3 -3
- package/src/commands/project/init.cmd.ts +3 -3
- package/src/commands/project/verify.cmd.ts +2 -2
- package/src/commands/session/assistant.cmd.ts +2 -2
- package/src/commands/session/compact.cmd.ts +1 -1
- package/src/commands/session/copy.cmd.ts +8 -7
- package/src/commands/session/rename.cmd.ts +3 -2
- package/src/commands/session/rewind.cmd.ts +3 -4
- package/src/commands/session/summary.cmd.ts +3 -3
- package/src/commands/session/tasks.cmd.ts +4 -2
- package/src/commands/settings/config.cmd.ts +4 -2
- package/src/commands/settings/effort.cmd.ts +10 -31
- package/src/commands/settings/fast.cmd.ts +2 -1
- package/src/commands/settings/mode.cmd.ts +3 -3
- package/src/commands/settings/model.cmd.ts +3 -2
- package/src/commands/settings/output-style.cmd.ts +9 -38
- package/src/commands/settings/permissions.cmd.ts +2 -2
- package/src/commands/settings/proactive.cmd.ts +2 -1
- package/src/commands/settings/route.cmd.ts +16 -0
- package/src/commands/settings/skills.cmd.ts +3 -3
- package/src/commands/settings/theme.cmd.ts +14 -0
- package/src/commands/speech/say.cmd.ts +2 -2
- package/src/commands/speech/transcribe.cmd.ts +2 -2
- package/src/commands/status/release-notes.cmd.ts +1 -1
- package/src/crews/.orkeon/orkeon.d.ts +539 -94
- package/src/crews/_probe-shared-memory/domain/messages.ts +54 -0
- package/src/crews/_probe-shared-memory/domain/probe-verdict.ts +17 -12
- package/src/crews/_probe-shared-memory/domain/prompts.ts +5 -0
- package/src/crews/_probe-shared-memory/probe.ork.ts +8 -6
- package/src/crews/advisor/application/messages.ts +4 -0
- package/src/crews/advisor/application/prompts.ts +4 -0
- package/src/crews/advisor/application/run-advisor.ts +2 -1
- package/src/crews/advisor/crew.ork.ts +6 -5
- package/src/crews/advisor/domain/advice.ts +7 -23
- package/src/crews/advisor/domain/messages.ts +8 -0
- package/src/crews/advisor/domain/prompts.ts +26 -0
- package/src/crews/agent-run/application/messages.ts +18 -0
- package/src/crews/agent-run/application/run-agent-run.ts +5 -4
- package/src/crews/agent-run/crew.ork.ts +4 -4
- package/src/crews/analyze/application/messages.ts +27 -0
- package/src/crews/analyze/application/prompts.ts +4 -0
- package/src/crews/analyze/application/run-analyze.ts +16 -14
- package/src/crews/analyze/crew.ork.ts +5 -4
- package/src/crews/analyze/domain/harvest.ts +33 -65
- package/src/crews/analyze/domain/prompts.ts +86 -0
- package/src/crews/code-review/application/lens-material.ts +24 -0
- package/src/crews/code-review/application/messages.ts +17 -0
- package/src/crews/code-review/application/prompts.ts +10 -17
- package/src/crews/code-review/application/review.ts +4 -1
- package/src/crews/code-review/application/run-code-review.ts +13 -15
- package/src/crews/code-review/crew.ork.ts +6 -5
- package/src/crews/code-review/domain/lenses.ts +6 -45
- package/src/crews/code-review/domain/messages.ts +25 -0
- package/src/crews/code-review/domain/prompts.ts +58 -0
- package/src/crews/code-review/domain/report.ts +5 -6
- package/src/crews/code-review/domain/scope.ts +6 -12
- package/src/crews/dev-batches/application/messages.ts +127 -0
- package/src/crews/dev-batches/application/plan-close.ts +12 -12
- package/src/crews/dev-batches/application/prompts.ts +10 -0
- package/src/crews/dev-batches/application/run-dev-batches.ts +57 -50
- package/src/crews/dev-batches/application/run-wave.ts +24 -22
- package/src/crews/dev-batches/application/seed-harvest.ts +8 -7
- package/src/crews/dev-batches/crew.ork.ts +13 -10
- package/src/crews/dev-batches/domain/batches-log.ts +1 -3
- package/src/crews/dev-batches/domain/markers.ts +5 -0
- package/src/crews/dev-batches/domain/messages.ts +6 -0
- package/src/crews/dev-batches/domain/wave-order.ts +3 -2
- package/src/crews/dev-change/application/change-material.ts +44 -0
- package/src/crews/dev-change/application/evidence.ts +25 -22
- package/src/crews/dev-change/application/messages.ts +81 -0
- package/src/crews/dev-change/application/{change-prompt.ts → prompts.ts} +40 -43
- package/src/crews/dev-change/application/run-dev-change.ts +43 -34
- package/src/crews/dev-change/crew.ork.ts +11 -9
- package/src/crews/dev-change/domain/change-answer.ts +24 -20
- package/src/crews/dev-change/domain/change-render.ts +14 -16
- package/src/crews/dev-change/domain/markers.ts +28 -0
- package/src/crews/dev-change/domain/messages.ts +16 -0
- package/src/crews/dev-implement/application/close.ts +21 -18
- package/src/crews/dev-implement/application/locate-sheet.ts +7 -5
- package/src/crews/dev-implement/application/messages.ts +161 -0
- package/src/crews/dev-implement/application/observe.ts +4 -2
- package/src/crews/dev-implement/application/prompts.ts +9 -0
- package/src/crews/dev-implement/application/report-writes.ts +14 -9
- package/src/crews/dev-implement/application/run-dev-implement.ts +84 -73
- package/src/crews/dev-implement/application/suite-job.ts +15 -11
- package/src/crews/dev-implement/crew.ork.ts +2 -1
- package/src/crews/dev-implement/domain/contracts.ts +59 -60
- package/src/crews/dev-implement/domain/correction.ts +16 -15
- package/src/crews/dev-implement/domain/cycles.ts +2 -1
- package/src/crews/dev-implement/domain/markers.ts +23 -0
- package/src/crews/dev-implement/domain/messages.ts +58 -0
- package/src/crews/dev-implement/domain/prompts.ts +93 -0
- package/src/crews/dev-implement/domain/roles.ts +3 -7
- package/src/crews/dev-implement/domain/sheet-edits.ts +6 -5
- package/src/crews/dev-implement/domain/sheet-ticks.ts +5 -4
- package/src/crews/dev-implement/domain/step-checks.ts +17 -16
- package/src/crews/dev-implement/domain/step-section.ts +6 -4
- package/src/crews/dev-learn/application/learn-prompt-fit.ts +63 -0
- package/src/crews/dev-learn/application/messages.ts +56 -0
- package/src/crews/dev-learn/application/prompts.ts +96 -0
- package/src/crews/dev-learn/application/run-dev-learn.ts +51 -43
- package/src/crews/dev-learn/crew.ork.ts +5 -4
- package/src/crews/dev-learn/domain/learn-answer.ts +60 -37
- package/src/crews/dev-learn/domain/markers.ts +10 -0
- package/src/crews/dev-learn/domain/messages.ts +74 -0
- package/src/crews/dev-learn/domain/owner-lines.ts +12 -9
- package/src/crews/dev-learn/domain/proposals-render.ts +8 -9
- package/src/crews/dev-plan/application/anchor-paths.ts +57 -20
- package/src/crews/dev-plan/application/inventory.ts +17 -13
- package/src/crews/dev-plan/application/messages.ts +88 -0
- package/src/crews/dev-plan/application/plan-prompt-fit.ts +44 -0
- package/src/crews/dev-plan/application/{plan-prompt.ts → prompts.ts} +37 -55
- package/src/crews/dev-plan/application/run-dev-plan.ts +103 -75
- package/src/crews/dev-plan/crew.ork.ts +12 -9
- package/src/crews/dev-plan/domain/inventory-model.ts +3 -3
- package/src/crews/dev-plan/domain/markers.ts +18 -0
- package/src/crews/dev-plan/domain/messages.ts +118 -0
- package/src/crews/dev-plan/domain/plan-answer.ts +118 -103
- package/src/crews/dev-plan/domain/plan-render.ts +33 -34
- package/src/crews/dev-plan/domain/prompts.ts +44 -0
- package/src/crews/dev-spec/application/messages.ts +30 -0
- package/src/crews/dev-spec/application/{spec-prompt.ts → prompts.ts} +42 -47
- package/src/crews/dev-spec/application/run-dev-spec.ts +67 -36
- package/src/crews/dev-spec/application/spec-material.ts +42 -0
- package/src/crews/dev-spec/crew.ork.ts +11 -9
- package/src/crews/dev-spec/domain/markers.ts +30 -0
- package/src/crews/dev-spec/domain/messages.ts +39 -0
- package/src/crews/dev-spec/domain/spec-answer.ts +46 -47
- package/src/crews/dev-spec/domain/spec-render.ts +21 -21
- package/src/crews/dev-verify/application/audit-brief.ts +187 -0
- package/src/crews/dev-verify/application/audit.ts +38 -30
- package/src/crews/dev-verify/application/capture.ts +34 -26
- package/src/crews/dev-verify/application/messages.ts +119 -0
- package/src/crews/dev-verify/application/prompts.ts +209 -0
- package/src/crews/dev-verify/application/run-dev-verify.ts +60 -46
- package/src/crews/dev-verify/application/run-gate.ts +11 -9
- package/src/crews/dev-verify/crew.ork.ts +7 -7
- package/src/crews/dev-verify/domain/audit-answer.ts +16 -12
- package/src/crews/dev-verify/domain/capture-sections.ts +5 -4
- package/src/crews/dev-verify/domain/commands.ts +3 -3
- package/src/crews/dev-verify/domain/gate.ts +21 -16
- package/src/crews/dev-verify/domain/markers.ts +16 -0
- package/src/crews/dev-verify/domain/mechanical-table.ts +37 -44
- package/src/crews/dev-verify/domain/messages.ts +92 -0
- package/src/crews/dev-verify/domain/verdict.ts +4 -4
- package/src/crews/git-commit/application/draft.ts +38 -55
- package/src/crews/git-commit/application/messages.ts +17 -0
- package/src/crews/git-commit/application/prompts.ts +47 -0
- package/src/crews/git-commit/application/run-git-commit.ts +16 -13
- package/src/crews/git-commit/crew.ork.ts +6 -5
- package/src/crews/git-commit/domain/commit.ts +15 -35
- package/src/crews/git-commit/domain/markers.ts +4 -0
- package/src/crews/git-commit/domain/messages.ts +48 -0
- package/src/crews/init-verifiers/application/authoring.ts +2 -1
- package/src/crews/init-verifiers/application/messages.ts +13 -0
- package/src/crews/init-verifiers/application/prompts.ts +5 -1
- package/src/crews/init-verifiers/application/run-init-verifiers.ts +3 -2
- package/src/crews/init-verifiers/crew.ork.ts +6 -5
- package/src/crews/main-loop/application/auto-compact.ts +2 -1
- package/src/crews/main-loop/application/messages.ts +81 -0
- package/src/crews/main-loop/application/prompts.ts +12 -0
- package/src/crews/main-loop/application/run-main-loop.ts +64 -31
- package/src/crews/main-loop/application/{turn-prompt.ts → turn-context.ts} +7 -8
- package/src/crews/main-loop/crew.ork.ts +12 -7
- package/src/crews/main-loop/domain/prompt-assembly.ts +45 -228
- package/src/crews/main-loop/domain/prompts.ts +336 -0
- package/src/crews/main-loop/domain/turn-chains.ts +10 -9
- package/src/crews/project-init/application/detect.ts +5 -4
- package/src/crews/project-init/application/messages.ts +15 -0
- package/src/crews/project-init/application/prompts.ts +11 -7
- package/src/crews/project-init/crew.ork.ts +6 -5
- package/src/crews/project-init/domain/existing-files.ts +6 -4
- package/src/crews/project-init/domain/messages.ts +13 -0
- package/src/crews/project-init/domain/package-map.ts +3 -3
- package/src/crews/project-init/domain/prompts.ts +10 -0
- package/src/crews/session-compact/application/prompts.ts +5 -0
- package/src/crews/session-compact/crew.ork.ts +6 -5
- package/src/crews/shared-memory-admit/application/prompts.ts +5 -0
- package/src/crews/shared-memory-admit/crew.ork.ts +4 -3
- package/src/crews/speech/application/messages.ts +3 -0
- package/src/crews/speech/application/prompts.ts +3 -0
- package/src/crews/speech/application/run-speech.ts +2 -1
- package/src/crews/speech/crew.ork.ts +2 -1
- package/src/shared/application/agents/child-agent.ts +11 -7
- package/src/shared/application/agents/messages.ts +35 -0
- package/src/shared/application/agents/route-agent.ts +115 -0
- package/src/shared/application/agents/run-sub-agent.ts +31 -8
- package/src/shared/application/compaction/compact-session.ts +19 -14
- package/src/shared/application/compaction/messages.ts +20 -0
- package/src/shared/application/compaction/prune-context.ts +94 -0
- package/src/shared/application/compaction/pruned-llm.ts +35 -0
- package/src/shared/application/dev/brief-inventory.ts +6 -4
- package/src/shared/application/dev/close-batch.ts +9 -7
- package/src/shared/application/dev/find-repo-pack.ts +4 -3
- package/src/shared/application/dev/learn-decision.ts +20 -18
- package/src/shared/application/dev/load-dev-context.ts +7 -8
- package/src/shared/application/dev/measure-access-cost.ts +5 -4
- package/src/shared/application/dev/messages.ts +135 -0
- package/src/shared/application/dev/phase-timer.ts +54 -0
- package/src/shared/application/dev/plan-source.ts +12 -8
- package/src/shared/application/dev/preflight.ts +16 -11
- package/src/shared/application/dev/prompts.ts +34 -0
- package/src/shared/application/dev/question-round.ts +25 -17
- package/src/shared/application/dev/resolve-work-folder.ts +4 -3
- package/src/shared/application/dev/settle-questions.ts +4 -2
- package/src/shared/application/dev/source-review.ts +12 -8
- package/src/shared/application/dev/source-step.ts +12 -10
- package/src/shared/application/dev/spend.ts +17 -4
- package/src/shared/application/dev/step-precedents.ts +2 -1
- package/src/shared/application/dev/tool-call-policy.ts +9 -11
- package/src/shared/application/dev/tool-callbacks.ts +52 -5
- package/src/shared/application/dev/tool-trace-recorder.ts +2 -1
- package/src/shared/application/dev/verdict-sources.ts +5 -3
- package/src/shared/application/dev/wrapped-tools.ts +4 -2
- package/src/shared/application/extra-tools.ts +2 -1
- package/src/shared/application/git/batch-worktree.ts +22 -17
- package/src/shared/application/git/commit-files.ts +24 -19
- package/src/shared/application/git/merge-batch.ts +11 -7
- package/src/shared/application/git/messages.ts +75 -0
- package/src/shared/application/git/open-pull-request.ts +4 -3
- package/src/shared/application/host-context.ts +59 -0
- package/src/shared/application/host-layout-store.ts +45 -0
- package/src/shared/application/llm-profile.ts +4 -3
- package/src/shared/application/messages.ts +14 -0
- package/src/shared/application/permission-rules.ts +10 -0
- package/src/shared/application/ports/decision.ts +14 -0
- package/src/shared/application/ports/human.ts +25 -0
- package/src/shared/application/ports/llm.ts +32 -3
- package/src/shared/application/ports/memory.ts +1 -1
- package/src/shared/application/ports/theme.ts +11 -0
- package/src/shared/application/ports.ts +4 -2
- package/src/shared/application/session-io.ts +2 -1
- package/src/shared/application/shared-memory/admit-entries.ts +16 -14
- package/src/shared/application/shared-memory/harvest-after-gaps.ts +5 -8
- package/src/shared/application/shared-memory/harvest-mistakes.ts +3 -2
- package/src/shared/application/shared-memory/import-agent-memory.ts +9 -7
- package/src/shared/application/shared-memory/memory-files.ts +2 -1
- package/src/shared/application/shared-memory/memory-settings.ts +2 -1
- package/src/shared/application/shared-memory/messages.ts +63 -0
- package/src/shared/application/shared-memory/push-candidate.ts +14 -11
- package/src/shared/application/shared-memory/recall-precedents.ts +2 -1
- package/src/shared/application/skills/messages.ts +4 -0
- package/src/shared/application/skills/suggest-skills.ts +102 -0
- package/src/shared/application/workflow/messages.ts +8 -0
- package/src/shared/application/workflow/workflow-state.ts +7 -6
- package/src/shared/domain/agent-policy/behavior-flags.ts +4 -10
- package/src/shared/domain/agent-policy/extra-tools.ts +2 -4
- package/src/shared/domain/agent-policy/messages.ts +66 -0
- package/src/shared/domain/agent-policy/path-rules.ts +299 -0
- package/src/shared/domain/agent-policy/permission.ts +20 -18
- package/src/shared/domain/agent-policy/prompts.ts +17 -0
- package/src/shared/domain/agent-policy/reasoning.ts +59 -0
- package/src/shared/domain/agent-policy/rule-sets.ts +18 -14
- package/src/shared/domain/agent-policy/tool-access.ts +17 -3
- package/src/shared/domain/agent-registry.ts +6 -5
- package/src/shared/domain/agents/chain.ts +2 -2
- package/src/shared/domain/agents/charter.ts +8 -5
- package/src/shared/domain/agents/exclusive.ts +2 -1
- package/src/shared/domain/agents/instances.ts +18 -15
- package/src/shared/domain/agents/messages.ts +39 -0
- package/src/shared/domain/agents/model-route.ts +199 -0
- package/src/shared/domain/agents/prompts.ts +20 -0
- package/src/shared/domain/code-intel-contract.ts +5 -4
- package/src/shared/domain/code-intel-routing.ts +8 -61
- package/src/shared/domain/compact-outcome.ts +5 -3
- package/src/shared/domain/compaction-thresholds.ts +2 -1
- package/src/shared/domain/compaction.ts +22 -113
- package/src/shared/domain/config-schema.ts +94 -81
- package/src/shared/domain/context-prune.ts +176 -0
- package/src/shared/domain/decision/questions.ts +102 -0
- package/src/shared/domain/dev/access-cost.ts +19 -15
- package/src/shared/domain/dev/batches-concurrency.ts +5 -6
- package/src/shared/domain/dev/build-commands.ts +5 -4
- package/src/shared/domain/dev/call-guard.ts +29 -28
- package/src/shared/domain/dev/carried-text.ts +3 -5
- package/src/shared/domain/dev/learn-proposals.ts +51 -12
- package/src/shared/domain/dev/learn-state.ts +3 -2
- package/src/shared/domain/dev/markers.ts +127 -0
- package/src/shared/domain/dev/messages.ts +271 -0
- package/src/shared/domain/dev/phase-timing.ts +50 -0
- package/src/shared/domain/dev/plan-checks.ts +24 -23
- package/src/shared/domain/dev/plan-format.ts +15 -25
- package/src/shared/domain/dev/project-files.ts +1 -15
- package/src/shared/domain/dev/prompts/brief-blocks.ts +20 -0
- package/src/shared/domain/dev/{review-prompt.ts → prompts.ts} +91 -61
- package/src/shared/domain/dev/questions.ts +33 -15
- package/src/shared/domain/dev/repo-pack.ts +12 -9
- package/src/shared/domain/dev/review-answer.ts +40 -17
- package/src/shared/domain/dev/review-brief.ts +54 -0
- package/src/shared/domain/dev/reviewer-charter.ts +4 -0
- package/src/shared/domain/dev/sheet-facts.ts +2 -4
- package/src/shared/domain/dev/spec-format.ts +13 -14
- package/src/shared/domain/dev/step-budget.ts +4 -2
- package/src/shared/domain/dev/step-rules.ts +3 -4
- package/src/shared/domain/dev/test-commands.ts +14 -10
- package/src/shared/domain/dev/tool-guards.ts +4 -3
- package/src/shared/domain/dev/trait-pattern.ts +14 -10
- package/src/shared/domain/dev/verdict-format.ts +14 -21
- package/src/shared/domain/dev/whitespace.ts +3 -2
- package/src/shared/domain/dev/work-folder.ts +6 -4
- package/src/shared/domain/dev/yaml-subset.ts +8 -26
- package/src/shared/domain/error-text.ts +13 -0
- package/src/shared/domain/git/close.ts +14 -11
- package/src/shared/domain/git/messages.ts +41 -0
- package/src/shared/domain/git/pull-request.ts +5 -5
- package/src/shared/domain/host-layout.ts +147 -0
- package/src/shared/domain/host-paths.ts +399 -0
- package/src/shared/domain/llm-failure.ts +35 -7
- package/src/shared/domain/llm-profile.ts +22 -3
- package/src/shared/domain/marked-message.ts +1 -5
- package/src/shared/domain/markers.ts +30 -0
- package/src/shared/domain/messages.ts +291 -0
- package/src/shared/domain/model-catalog.ts +2 -9
- package/src/shared/domain/permission-modes.ts +4 -8
- package/src/shared/domain/prelude.ts +2 -2
- package/src/shared/domain/project-manifests.ts +3 -2
- package/src/shared/domain/prompts.ts +233 -0
- package/src/shared/domain/search-routing.ts +3 -11
- package/src/shared/domain/secret-patterns.ts +3 -2
- package/src/shared/domain/session-keys.ts +7 -0
- package/src/shared/domain/session-start.ts +3 -2
- package/src/shared/domain/shared-memory/agent-memory-import.ts +4 -2
- package/src/shared/domain/shared-memory/candidates.ts +3 -4
- package/src/shared/domain/shared-memory/entry.ts +26 -20
- package/src/shared/domain/shared-memory/front-matter.ts +17 -13
- package/src/shared/domain/shared-memory/gate.ts +4 -3
- package/src/shared/domain/shared-memory/harvest.ts +9 -6
- package/src/shared/domain/shared-memory/layout.ts +11 -8
- package/src/shared/domain/shared-memory/markers.ts +9 -0
- package/src/shared/domain/shared-memory/messages.ts +66 -0
- package/src/shared/domain/shared-memory/precedents-block.ts +4 -15
- package/src/shared/domain/shared-memory/prompts.ts +28 -0
- package/src/shared/domain/shared-memory/refused.ts +3 -3
- package/src/shared/domain/skills/prompts.ts +4 -0
- package/src/shared/domain/skills/shortlist.ts +149 -0
- package/src/shared/domain/snip-turns.ts +2 -14
- package/src/shared/domain/speech.ts +2 -1
- package/src/shared/domain/tool-trace.ts +5 -7
- package/src/shared/domain/verifiers.ts +7 -11
- package/src/shared/domain/vfs.ts +8 -1
- package/src/shared/domain/workflow/prompts.ts +15 -0
- package/src/shared/domain/workflow/state-file.ts +14 -12
- package/src/shared/infrastructure/globals.ts +7 -2
- package/src/shared/infrastructure/orkeon/child-agents.ts +11 -16
- package/src/shared/infrastructure/orkeon/chooser.ts +32 -0
- package/src/shared/infrastructure/orkeon/decision-model.ts +31 -0
- package/src/shared/infrastructure/orkeon/dev-deps.ts +21 -14
- package/src/shared/infrastructure/orkeon/files.ts +24 -6
- package/src/shared/infrastructure/orkeon/github-pull-requests.ts +3 -2
- package/src/shared/infrastructure/orkeon/host-context.ts +36 -0
- package/src/shared/infrastructure/orkeon/human-input.ts +1 -5
- package/src/shared/infrastructure/orkeon/llm-profile.ts +36 -16
- package/src/shared/infrastructure/orkeon/llm.ts +85 -30
- package/src/shared/infrastructure/orkeon/markers.ts +6 -0
- package/src/shared/infrastructure/orkeon/memory-store.ts +1 -1
- package/src/shared/infrastructure/orkeon/memory-tools.ts +18 -20
- package/src/shared/infrastructure/orkeon/messages.ts +15 -0
- package/src/shared/infrastructure/orkeon/prompts.ts +47 -0
- package/src/shared/infrastructure/orkeon/reasoning.ts +40 -0
- package/src/shared/infrastructure/orkeon/script-tools.ts +14 -19
- package/src/shared/infrastructure/orkeon/session-store.ts +7 -51
- package/src/shared/infrastructure/orkeon/shell-jobs.ts +13 -7
- package/src/shared/infrastructure/orkeon/shell.ts +13 -5
- package/src/shared/infrastructure/orkeon/tool-catalogue.ts +3 -2
- package/src/shared/infrastructure/orkeon/wiring.ts +68 -12
- package/src/crews/dev-learn/application/learn-prompt.ts +0 -140
- package/src/crews/dev-verify/application/auditor-prompt.ts +0 -323
- package/src/shared/domain/session-summary.ts +0 -13
|
@@ -6,25 +6,31 @@
|
|
|
6
6
|
// (createCrewHost(ctx.services), createPermissionRules(ctx.services)) and hands
|
|
7
7
|
// them over with the command's log.
|
|
8
8
|
|
|
9
|
+
import { routeAgent } from "../../shared/application/agents/route-agent.ts";
|
|
10
|
+
import type { RouteDeps, RouteTask } from "../../shared/application/agents/route-agent.ts";
|
|
9
11
|
import type { CrewHost, CrewLaunchOptions, PermissionRules, ToolCatalogue } from "../../shared/application/ports.ts";
|
|
10
12
|
import type { ConfigStore } from "../../shared/application/config-store.ts";
|
|
11
13
|
import type { SessionIo } from "../../shared/application/session-io.ts";
|
|
12
14
|
import { configuredNames, resolveExtraTools } from "../../shared/application/extra-tools.ts";
|
|
13
15
|
import { readLlmProfile } from "../../shared/application/llm-profile.ts";
|
|
14
|
-
import { syncPermissionRules } from "../../shared/application/permission-rules.ts";
|
|
16
|
+
import { builtInRules, syncPermissionRules } from "../../shared/application/permission-rules.ts";
|
|
15
17
|
import { readMemoryDir } from "../../shared/application/shared-memory/memory-settings.ts";
|
|
16
|
-
import {
|
|
18
|
+
import { listsOf } from "../../shared/application/host-context.ts";
|
|
19
|
+
import type { HostSource } from "../../shared/application/host-context.ts";
|
|
17
20
|
import { formatRule } from "../../shared/domain/agent-policy/permission.ts";
|
|
18
21
|
import { chainDepthLine, chainDepthRefusal } from "../../shared/domain/agents/chain.ts";
|
|
19
22
|
import { exclusiveLine, exclusiveRefusal } from "../../shared/domain/agents/exclusive.ts";
|
|
20
|
-
import { LLM_PROFILE_INPUT_KEY } from "../../shared/domain/llm-profile.ts";
|
|
23
|
+
import { LLM_PROFILE_FALLBACK_INPUT_KEY, LLM_PROFILE_INPUT_KEY } from "../../shared/domain/llm-profile.ts";
|
|
21
24
|
import { errorText } from "../../shared/domain/prelude.ts";
|
|
22
25
|
import type { EpilogueCall, PreludeCall } from "../../shared/domain/prelude.ts";
|
|
23
26
|
import type { StartOutput } from "../../shared/domain/session-start.ts";
|
|
24
27
|
import { SPEAK_TOOL, VOICE_REPLY_CONFIG_KEY, voiceReplyEpilogue, voiceReplyOn } from "../../shared/domain/speech.ts";
|
|
28
|
+
import { EXTRA_TOOLS_CONFIG_KEY, formatExtraTool } from "../../shared/domain/agent-policy/extra-tools.ts";
|
|
29
|
+
import { EXTRA_TOOL_ENTRY_RULE } from "../../shared/domain/agent-policy/messages.ts";
|
|
25
30
|
import {
|
|
26
|
-
|
|
27
|
-
|
|
31
|
+
extraToolIgnored, extraToolMissing, extraToolsUnreadable, invalidPermissionEntries, NO_SESSION_RULES, ruleDormant,
|
|
32
|
+
ruleOverridden, voiceReplyNoSpeakTool, voiceReplyUnreadable,
|
|
33
|
+
} from "./messages.ts";
|
|
28
34
|
|
|
29
35
|
/** The command's log as the runtime hands it to a command: a line and its details. */
|
|
30
36
|
export interface CommandLog {
|
|
@@ -39,6 +45,9 @@ export interface LaunchDeps {
|
|
|
39
45
|
crews: Pick<CrewHost, "launch">;
|
|
40
46
|
log: Pick<CommandLog, "info">;
|
|
41
47
|
llmProfile?: string | null;
|
|
48
|
+
/** Set when the routing picked `llmProfile`: the session's own profile ("" for the host's default model), which the
|
|
49
|
+
* crew falls back on when the host declares no profile of the routed name. */
|
|
50
|
+
llmProfileFallback?: string;
|
|
42
51
|
}
|
|
43
52
|
|
|
44
53
|
/** `deps` with the session's `llm.profile` read: what every command hands launchCrew. A setting that cannot be
|
|
@@ -51,6 +60,16 @@ export async function withLlmProfile<D extends LaunchDeps & { log: Pick<CommandL
|
|
|
51
60
|
return { ...deps, llmProfile: read.profile };
|
|
52
61
|
}
|
|
53
62
|
|
|
63
|
+
/** `deps` with the profile the launch of `task.crew` runs on: the session's `llm.profile`, then, with `route.agents`
|
|
64
|
+
* on, the rung of the ladder the host's decision model picks for the command (shared/application/agents/route-agent). */
|
|
65
|
+
export async function withRoutedProfile<D extends LaunchDeps & { log: Pick<CommandLog, "warn" | "info"> }>(
|
|
66
|
+
deps: D, config: Pick<ConfigStore, "readValue" | "readFile">, routing: Omit<RouteDeps, "config" | "log">, task: RouteTask,
|
|
67
|
+
): Promise<D & { llmProfile: string | null }> {
|
|
68
|
+
const profiled = await withLlmProfile(deps, config);
|
|
69
|
+
const routed = await routeAgent({ ...routing, config, log: deps.log }, task, profiled.llmProfile);
|
|
70
|
+
return routed === profiled.llmProfile ? profiled : { ...profiled, llmProfile: routed, llmProfileFallback: profiled.llmProfile ?? "" };
|
|
71
|
+
}
|
|
72
|
+
|
|
54
73
|
/** A crew's completion, as an async command's `completed` receives it; `intent` names the crew that answered,
|
|
55
74
|
* `streamed` says the console already showed the answer as it was generated (Orkeon #228). */
|
|
56
75
|
export interface CrewCompletion {
|
|
@@ -83,6 +102,7 @@ export function launchCrew(
|
|
|
83
102
|
const profile = deps.llmProfile ?? null;
|
|
84
103
|
if (profile !== null) {
|
|
85
104
|
input = { ...input, [LLM_PROFILE_INPUT_KEY]: profile };
|
|
105
|
+
if (deps.llmProfileFallback !== undefined) input = { ...input, [LLM_PROFILE_FALLBACK_INPUT_KEY]: deps.llmProfileFallback };
|
|
86
106
|
details = { ...details, llmProfile: profile };
|
|
87
107
|
}
|
|
88
108
|
let ticket: string;
|
|
@@ -114,6 +134,8 @@ export interface MainLoopLaunchDeps extends LaunchDeps {
|
|
|
114
134
|
config: Pick<ConfigStore, "readValue" | "readFile">;
|
|
115
135
|
catalogue: Pick<ToolCatalogue, "find">;
|
|
116
136
|
gate: PermissionRules;
|
|
137
|
+
/** This run's host context, for its path lists (paths.deny in the gate); absent: no list. */
|
|
138
|
+
host?: HostSource;
|
|
117
139
|
}
|
|
118
140
|
|
|
119
141
|
/**
|
|
@@ -140,33 +162,20 @@ export async function launchMainLoop(
|
|
|
140
162
|
const permissionMode = resolved ? resolved.mode : input.permissionMode;
|
|
141
163
|
|
|
142
164
|
const extras = await resolveExtraTools(deps);
|
|
143
|
-
for (const tool of extras.missing)
|
|
144
|
-
log.warn(
|
|
145
|
-
`extra tool '${tool.name}' is not registered by the host and is left out ` +
|
|
146
|
-
"(its MCP server did not connect, its plugin did not load, or the name is mistyped)",
|
|
147
|
-
);
|
|
148
|
-
}
|
|
165
|
+
for (const tool of extras.missing) log.warn(extraToolMissing(tool.name));
|
|
149
166
|
for (const entry of extras.invalid) {
|
|
150
|
-
log.warn(
|
|
167
|
+
log.warn(extraToolIgnored(EXTRA_TOOLS_CONFIG_KEY, entry, EXTRA_TOOL_ENTRY_RULE));
|
|
151
168
|
}
|
|
152
169
|
if (extras.unreadable !== undefined) {
|
|
153
|
-
log.warn(
|
|
170
|
+
log.warn(extraToolsUnreadable(EXTRA_TOOLS_CONFIG_KEY, extras.unreadable));
|
|
154
171
|
}
|
|
155
172
|
|
|
156
|
-
const builtIn =
|
|
173
|
+
const builtIn = builtInRules((await readMemoryDir(deps.config)).dir, await listsOf(deps.host));
|
|
157
174
|
const sync = await syncPermissionRules({ session, gate: deps.gate, extraNames: configuredNames(extras), builtIn });
|
|
158
|
-
for (const rule of sync.overridden)
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
log.warn(
|
|
163
|
-
`permission rule '${rule}' is dormant: ${EXTRA_TOOLS_CONFIG_KEY} does not list its tool, the gate does not get it`,
|
|
164
|
-
);
|
|
165
|
-
}
|
|
166
|
-
if (sync.invalid.length > 0) {
|
|
167
|
-
log.warn(`${sync.invalid.length} stored permission entr(ies) are not rules and were ignored`);
|
|
168
|
-
}
|
|
169
|
-
if (!sync.applied) log.warn("the host keeps no session rules: the gate decides each call from the mode alone");
|
|
175
|
+
for (const rule of sync.overridden) log.warn(ruleOverridden(formatRule(rule)));
|
|
176
|
+
for (const rule of sync.dormant) log.warn(ruleDormant(rule, EXTRA_TOOLS_CONFIG_KEY));
|
|
177
|
+
if (sync.invalid.length > 0) log.warn(invalidPermissionEntries(sync.invalid.length));
|
|
178
|
+
if (!sync.applied) log.warn(NO_SESSION_RULES);
|
|
170
179
|
const epilogue = await voiceReply(deps);
|
|
171
180
|
const profiled = deps.llmProfile === undefined ? await withLlmProfile(deps, deps.config) : deps;
|
|
172
181
|
return launchCrew(
|
|
@@ -199,33 +208,47 @@ async function voiceReply(deps: Pick<MainLoopLaunchDeps, "config" | "catalogue"
|
|
|
199
208
|
try {
|
|
200
209
|
value = (await deps.config.readValue(VOICE_REPLY_CONFIG_KEY)).value;
|
|
201
210
|
} catch (error) {
|
|
202
|
-
deps.log.warn(
|
|
211
|
+
deps.log.warn(voiceReplyUnreadable(VOICE_REPLY_CONFIG_KEY, errorText(error)));
|
|
203
212
|
return undefined;
|
|
204
213
|
}
|
|
205
214
|
if (!voiceReplyOn(value)) return undefined;
|
|
206
215
|
const speak = deps.catalogue.find(SPEAK_TOOL);
|
|
207
216
|
if (speak === undefined) {
|
|
208
|
-
deps.log.warn(
|
|
209
|
-
`${VOICE_REPLY_CONFIG_KEY} is on but the host registers no '${SPEAK_TOOL}': the answer is not read aloud ` +
|
|
210
|
-
"(start orkeon-code with ORKEON_CODE_AUDIO_DIR and ORKEON_CODE_VOICE=1)",
|
|
211
|
-
);
|
|
217
|
+
deps.log.warn(voiceReplyNoSpeakTool(VOICE_REPLY_CONFIG_KEY, SPEAK_TOOL));
|
|
212
218
|
return undefined;
|
|
213
219
|
}
|
|
214
220
|
return voiceReplyEpilogue(speak);
|
|
215
221
|
}
|
|
216
222
|
|
|
217
|
-
/**
|
|
218
|
-
|
|
223
|
+
/** The opening of a markdown block a prefix on the same line would turn into plain text. */
|
|
224
|
+
const OPENS_ON_A_BLOCK = /^\s*(#{1,6}\s|```|~~~|[-*+]\s|\d+\.\s|>|\|)/;
|
|
225
|
+
|
|
226
|
+
/** `<okPrefix><payload>`, the prefix on its own line when the payload opens on a block. */
|
|
227
|
+
function prefixed(okPrefix: string, payload: string): string {
|
|
228
|
+
const inline = !okPrefix || okPrefix.endsWith("\n") || !OPENS_ON_A_BLOCK.test(payload);
|
|
229
|
+
return inline ? okPrefix + payload : `${okPrefix.trimEnd()}\n\n${payload}`;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
/** Write a crew's completion: `<okPrefix><payload>` as a markdown block, or the line `✗ <label> failed: …`; nothing
|
|
233
|
+
* for a success the console already streamed, or the answer would show twice (Orkeon #228). */
|
|
219
234
|
export function writeCompleted(
|
|
220
|
-
out: { writeLine(text: string): void },
|
|
235
|
+
out: { writeLine(text: string): void; writeBlock(spec: { kind: "markdown"; text: string }): void },
|
|
221
236
|
result: CrewCompletion,
|
|
222
237
|
label: string,
|
|
223
238
|
okPrefix = "",
|
|
224
239
|
): void {
|
|
225
240
|
if (result.success && result.streamed === true) return;
|
|
226
|
-
out.
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
241
|
+
if (result.success) out.writeBlock({ kind: "markdown", text: prefixed(okPrefix, String(result.payload)) });
|
|
242
|
+
else out.writeLine("✗ " + label + " failed: " + (result.error ?? "unknown"));
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
/** `writeCompleted` for what a program wrote and no model did: a transcript, a count. Markdown would change it (the
|
|
246
|
+
* stars of `*.ts`, the underscores of `__init__.py`), so it stays a line. */
|
|
247
|
+
export function writePlainCompleted(
|
|
248
|
+
out: { writeLine(text: string): void },
|
|
249
|
+
result: CrewCompletion,
|
|
250
|
+
label: string,
|
|
251
|
+
): void {
|
|
252
|
+
if (result.success && result.streamed === true) return;
|
|
253
|
+
out.writeLine(result.success ? String(result.payload) : "✗ " + label + " failed: " + (result.error ?? "unknown"));
|
|
231
254
|
}
|
|
@@ -5,6 +5,9 @@
|
|
|
5
5
|
|
|
6
6
|
import type { Logger, Shell } from "../../../shared/application/ports.ts";
|
|
7
7
|
import type { CommandView } from "../view.ts";
|
|
8
|
+
import {
|
|
9
|
+
andMore, branchRefusedLog, checkoutFailed, dirtyTreeRefusal, exitCode, looksLikeOption, notABranchName, switchedTo,
|
|
10
|
+
} from "./messages.ts";
|
|
8
11
|
|
|
9
12
|
/** True when `git status --porcelain` reported at least one changed path. */
|
|
10
13
|
export function hasUncommittedChanges(porcelain: unknown): boolean {
|
|
@@ -34,12 +37,12 @@ export function planBranch(tokens: readonly string[]): BranchPlan {
|
|
|
34
37
|
const name = String((tokens ?? [])[0] ?? "").trim();
|
|
35
38
|
if (name.length === 0) return { action: "show" };
|
|
36
39
|
if (name.startsWith("-")) {
|
|
37
|
-
return { action: "refuse", reason:
|
|
40
|
+
return { action: "refuse", reason: looksLikeOption(name) };
|
|
38
41
|
}
|
|
39
42
|
if (!SAFE_BRANCH.test(name)) {
|
|
40
43
|
return {
|
|
41
44
|
action: "refuse",
|
|
42
|
-
reason:
|
|
45
|
+
reason: notABranchName(name),
|
|
43
46
|
};
|
|
44
47
|
}
|
|
45
48
|
return { action: "checkout", branch: name };
|
|
@@ -55,11 +58,7 @@ export function planBranch(tokens: readonly string[]): BranchPlan {
|
|
|
55
58
|
export function describeDirtyTreeRefusal(branch: string, porcelain: string): string {
|
|
56
59
|
const changed = porcelain.split("\n").filter((l) => l.trim().length > 0);
|
|
57
60
|
const shown = changed.slice(0, 5).map((l) => ` ${l.trim()}`).join("\n");
|
|
58
|
-
return (
|
|
59
|
-
`refusing to check out '${branch}': ${changed.length} uncommitted change(s) in the working tree.\n` +
|
|
60
|
-
`${shown}${changed.length > 5 ? `\n … and ${changed.length - 5} more` : ""}\n` +
|
|
61
|
-
"Commit them (/commit) or stash them first — a checkout would either fail or carry them across."
|
|
62
|
-
);
|
|
61
|
+
return dirtyTreeRefusal(branch, changed.length, shown, changed.length > 5 ? andMore(changed.length - 5) : "");
|
|
63
62
|
}
|
|
64
63
|
|
|
65
64
|
export interface BranchDeps {
|
|
@@ -83,13 +82,13 @@ export async function runBranch(tokens: readonly string[], deps: BranchDeps): Pr
|
|
|
83
82
|
const status = await shell.run("git status --porcelain");
|
|
84
83
|
const porcelain = status.stdout;
|
|
85
84
|
if (status.exitCode === 0 && hasUncommittedChanges(porcelain)) {
|
|
86
|
-
deps.log.warn(
|
|
85
|
+
deps.log.warn(branchRefusedLog(plan.branch));
|
|
87
86
|
return { text: describeDirtyTreeRefusal(plan.branch, porcelain) };
|
|
88
87
|
}
|
|
89
88
|
|
|
90
89
|
const r = await shell.run(`git checkout ${plan.branch}`);
|
|
91
90
|
if (r.exitCode !== 0) {
|
|
92
|
-
return { text:
|
|
91
|
+
return { text: checkoutFailed(r.stderr.trim() || r.stdout.trim() || exitCode(r.exitCode)) };
|
|
93
92
|
}
|
|
94
|
-
return { text: r.stderr.trim() || r.stdout.trim() ||
|
|
93
|
+
return { text: r.stderr.trim() || r.stdout.trim() || switchedTo(plan.branch) };
|
|
95
94
|
}
|
|
@@ -9,6 +9,9 @@ import { buildCommitPlan, isCommitPermitted, parseCommitArgs } from "../../../cr
|
|
|
9
9
|
import { commandLine, splitWords } from "../args.ts";
|
|
10
10
|
import { readPullRequestContext } from "../pr-context.ts";
|
|
11
11
|
import type { PullRequestContext, PullRequestContextPorts } from "../pr-context.ts";
|
|
12
|
+
import { COMMIT_CANCELLED, NO_ANSWER_REFUSAL, cannotPromptRefusal, commitApproved } from "./messages.ts";
|
|
13
|
+
import { refusedLine } from "../../../shared/application/git/messages.ts";
|
|
14
|
+
import { failedLine } from "../messages.ts";
|
|
12
15
|
|
|
13
16
|
export interface CommitCommandDeps {
|
|
14
17
|
session: Pick<SessionIo, "resolveEffectiveSessionMode">;
|
|
@@ -35,20 +38,13 @@ async function confirmOrRefuse(deps: Pick<CommitCommandDeps, "confirm" | "write"
|
|
|
35
38
|
try {
|
|
36
39
|
answer = await deps.confirm(question);
|
|
37
40
|
} catch (e: any) {
|
|
38
|
-
return (
|
|
39
|
-
"refused: /commit needs a confirmation and this session cannot prompt " +
|
|
40
|
-
`(${String(e?.message ?? e)}). Re-run as '/commit --yes' if you intend to stage ` +
|
|
41
|
-
"and commit the changed files unattended."
|
|
42
|
-
);
|
|
41
|
+
return cannotPromptRefusal(String(e?.message ?? e));
|
|
43
42
|
}
|
|
44
43
|
if (answer === true) return null;
|
|
45
44
|
if (typeof answer !== "boolean") {
|
|
46
|
-
return
|
|
47
|
-
"refused: the confirmation prompt returned no answer (non-interactive session). " +
|
|
48
|
-
"Re-run as '/commit --yes' to stage and commit the changed files unattended."
|
|
49
|
-
);
|
|
45
|
+
return NO_ANSWER_REFUSAL;
|
|
50
46
|
}
|
|
51
|
-
return
|
|
47
|
+
return COMMIT_CANCELLED;
|
|
52
48
|
}
|
|
53
49
|
|
|
54
50
|
/** `/commit [--yes] [--push] [--pr] [--note <text>] [<path>…]`, from the command's raw tokens: the refusal, written,
|
|
@@ -65,7 +61,7 @@ export async function runCommitCommand(tokens: readonly string[], deps: CommitCo
|
|
|
65
61
|
|
|
66
62
|
const permitted = isCommitPermitted(mode);
|
|
67
63
|
if (!permitted.allowed) {
|
|
68
|
-
deps.write(
|
|
64
|
+
deps.write(refusedLine(permitted.reason));
|
|
69
65
|
return { refused: permitted.reason };
|
|
70
66
|
}
|
|
71
67
|
|
|
@@ -73,12 +69,12 @@ export async function runCommitCommand(tokens: readonly string[], deps: CommitCo
|
|
|
73
69
|
const plan = buildCommitPlan({ push, pr, paths });
|
|
74
70
|
const refusal = await confirmOrRefuse(deps, plan.notice, plan.question);
|
|
75
71
|
if (refusal !== null) {
|
|
76
|
-
deps.write(
|
|
72
|
+
deps.write(failedLine(refusal));
|
|
77
73
|
return { refused: refusal };
|
|
78
74
|
}
|
|
79
75
|
}
|
|
80
76
|
|
|
81
|
-
deps.log.info(
|
|
77
|
+
deps.log.info(commitApproved(mode, via));
|
|
82
78
|
const context: PullRequestContext | null = pr || push ? await readPullRequestContext(deps.pr) : null;
|
|
83
79
|
// A yes to a plan that named the pull request is the question the github call needs; --yes asked nothing.
|
|
84
80
|
return {
|
|
@@ -5,11 +5,17 @@
|
|
|
5
5
|
|
|
6
6
|
import type { Logger, Shell } from "../../../shared/application/ports.ts";
|
|
7
7
|
import type { CommandView } from "../view.ts";
|
|
8
|
+
import {
|
|
9
|
+
NOT_A_PATHSPEC, STAGED_CHANGES, WORKING_TREE_CHANGES, argumentsIgnored, diffFailed, diffIgnored, exitCode, noChanges,
|
|
10
|
+
notAnAllowedDiffOption, scopeLine,
|
|
11
|
+
} from "./messages.ts";
|
|
8
12
|
|
|
9
13
|
export interface DiffPlan {
|
|
10
14
|
/** The git argument string, already assembled. */
|
|
11
15
|
args: string;
|
|
12
16
|
staged: boolean;
|
|
17
|
+
/** Whether git answers with a unified diff, which the console can colour, rather than a summary. */
|
|
18
|
+
unified: boolean;
|
|
13
19
|
/** Tokens that were dropped, with the reason — never silently ignored. */
|
|
14
20
|
rejected: Array<{ value: string; reason: string }>;
|
|
15
21
|
}
|
|
@@ -29,6 +35,9 @@ export const ALLOWED_DIFF_FLAGS = [
|
|
|
29
35
|
"--numstat", "--shortstat", "-p", "--unified", "--word-diff",
|
|
30
36
|
];
|
|
31
37
|
|
|
38
|
+
/** The allowed options under which git answers with something other than a unified diff. */
|
|
39
|
+
const NOT_UNIFIED_FLAGS = ["--stat", "--name-only", "--name-status", "--numstat", "--shortstat", "--word-diff"];
|
|
40
|
+
|
|
32
41
|
/** A pathspec: no leading dash, no shell metacharacter, no parent traversal. */
|
|
33
42
|
const SAFE_PATHSPEC = /^[A-Za-z0-9._/\-*]+$/;
|
|
34
43
|
|
|
@@ -45,12 +54,12 @@ export function planDiff(tokens: readonly string[]): DiffPlan {
|
|
|
45
54
|
// `--unified=3` and `-U3` carry a value; compare on the option part.
|
|
46
55
|
const head = token.split("=")[0];
|
|
47
56
|
if (ALLOWED_DIFF_FLAGS.includes(head)) flags.push(token);
|
|
48
|
-
else rejected.push({ value: token, reason:
|
|
57
|
+
else rejected.push({ value: token, reason: notAnAllowedDiffOption(ALLOWED_DIFF_FLAGS.join(" ")) });
|
|
49
58
|
continue;
|
|
50
59
|
}
|
|
51
60
|
|
|
52
61
|
if (!SAFE_PATHSPEC.test(token) || token.includes("..")) {
|
|
53
|
-
rejected.push({ value: token, reason:
|
|
62
|
+
rejected.push({ value: token, reason: NOT_A_PATHSPEC });
|
|
54
63
|
continue;
|
|
55
64
|
}
|
|
56
65
|
paths.push(token);
|
|
@@ -59,14 +68,12 @@ export function planDiff(tokens: readonly string[]): DiffPlan {
|
|
|
59
68
|
const staged = flags.some((f) => f === "--staged" || f === "--cached");
|
|
60
69
|
// `--` separates options from pathspecs, so a path that looks like a ref stays a path.
|
|
61
70
|
const args = [...flags, ...(paths.length > 0 ? ["--", ...paths] : [])].join(" ");
|
|
62
|
-
|
|
71
|
+
const unified = !flags.some((f) => NOT_UNIFIED_FLAGS.includes(f.split("=")[0]));
|
|
72
|
+
return { args, staged, unified, rejected };
|
|
63
73
|
}
|
|
64
74
|
|
|
65
|
-
/** Baseline wording for an empty diff — a distinct sentence, not "(no output)". */
|
|
66
|
-
export const NO_CHANGES_MESSAGE = "No changes to show.";
|
|
67
|
-
|
|
68
75
|
export function describeDiffScope(plan: DiffPlan): string {
|
|
69
|
-
return plan.staged ?
|
|
76
|
+
return plan.staged ? STAGED_CHANGES : WORKING_TREE_CHANGES;
|
|
70
77
|
}
|
|
71
78
|
|
|
72
79
|
export interface DiffDeps {
|
|
@@ -78,20 +85,23 @@ export interface DiffDeps {
|
|
|
78
85
|
* each ignored token logged and counted in the closing message. */
|
|
79
86
|
export async function runDiff(tokens: readonly string[], deps: DiffDeps): Promise<CommandView> {
|
|
80
87
|
const plan = planDiff(tokens);
|
|
81
|
-
for (const r of plan.rejected) deps.log.warn(
|
|
88
|
+
for (const r of plan.rejected) deps.log.warn(diffIgnored(r.value, r.reason));
|
|
82
89
|
|
|
83
90
|
const r = await deps.shell.run(`git diff ${plan.args}`.trim());
|
|
84
91
|
if (r.exitCode !== 0) {
|
|
85
92
|
const err = r.stderr.trim();
|
|
86
|
-
return { text:
|
|
93
|
+
return { text: diffFailed(err || exitCode(r.exitCode)) };
|
|
87
94
|
}
|
|
88
95
|
|
|
89
96
|
const out = r.stdout;
|
|
90
97
|
if (out.trim().length === 0) {
|
|
91
|
-
return { text:
|
|
98
|
+
return { text: noChanges(describeDiffScope(plan)) };
|
|
92
99
|
}
|
|
100
|
+
const scope = scopeLine(describeDiffScope(plan));
|
|
101
|
+
// A merge conflict's combined diff (`@@@`, two columns of signs) is not the unified form the block numbers.
|
|
102
|
+
const unified = plan.unified && !/^@@@ /m.test(out);
|
|
93
103
|
return {
|
|
94
|
-
lines: [
|
|
95
|
-
...(plan.rejected.length > 0 ? { text:
|
|
104
|
+
...(unified ? { lines: [scope], diff: out } : { lines: [scope, out] }),
|
|
105
|
+
...(plan.rejected.length > 0 ? { text: argumentsIgnored(plan.rejected.length) } : {}),
|
|
96
106
|
};
|
|
97
107
|
}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
// The text /branch, /commit, /diff, /review and /passes show the user (ADR 0026): their refusals and their answers.
|
|
2
|
+
// Read by branch.ts, commit.ts, diff.ts and review.ts.
|
|
3
|
+
|
|
4
|
+
// /branch
|
|
5
|
+
export const looksLikeOption = (name: string) => `'${name}' looks like an option, not a branch name`;
|
|
6
|
+
export const notABranchName = (name: string) =>
|
|
7
|
+
`'${name}' is not a plausible branch name (letters, digits, '.', '_', '/', '-')`;
|
|
8
|
+
export const dirtyTreeRefusal = (branch: string, count: number, shown: string, more: string) =>
|
|
9
|
+
`refusing to check out '${branch}': ${count} uncommitted change(s) in the working tree.\n` +
|
|
10
|
+
`${shown}${more}\n` +
|
|
11
|
+
"Commit them (/commit) or stash them first — a checkout would either fail or carry them across.";
|
|
12
|
+
export const andMore = (count: number) => `\n … and ${count} more`;
|
|
13
|
+
export const branchRefusedLog = (branch: string) =>
|
|
14
|
+
`/branch refused: uncommitted changes block the checkout of '${branch}'`;
|
|
15
|
+
export const checkoutFailed = (reason: string) => `checkout failed: ${reason}`;
|
|
16
|
+
export const switchedTo = (branch: string) => `switched to '${branch}'`;
|
|
17
|
+
export const exitCode = (code: number) => `exit code ${code}`;
|
|
18
|
+
|
|
19
|
+
// /commit
|
|
20
|
+
export const cannotPromptRefusal = (reason: string) =>
|
|
21
|
+
"refused: /commit needs a confirmation and this session cannot prompt " +
|
|
22
|
+
`(${reason}). Re-run as '/commit --yes' if you intend to stage ` +
|
|
23
|
+
"and commit the changed files unattended.";
|
|
24
|
+
export const NO_ANSWER_REFUSAL =
|
|
25
|
+
"refused: the confirmation prompt returned no answer (non-interactive session). " +
|
|
26
|
+
"Re-run as '/commit --yes' to stage and commit the changed files unattended.";
|
|
27
|
+
export const COMMIT_CANCELLED = "cancelled — nothing was staged and nothing was committed.";
|
|
28
|
+
export const commitApproved = (mode: string, via: string) => `commit approved — permission mode '${mode}' (${via})`;
|
|
29
|
+
|
|
30
|
+
// /diff
|
|
31
|
+
/** Baseline wording for an empty diff — a distinct sentence, not "(no output)". */
|
|
32
|
+
export const NO_CHANGES_MESSAGE = "No changes to show.";
|
|
33
|
+
export const notAnAllowedDiffOption = (allowed: string) => `not an allowed diff option (allowed: ${allowed})`;
|
|
34
|
+
export const NOT_A_PATHSPEC = "not a plausible pathspec (letters, digits, '.', '_', '/', '-', '*'; no '..')";
|
|
35
|
+
export const STAGED_CHANGES = "staged changes";
|
|
36
|
+
export const WORKING_TREE_CHANGES = "working-tree changes since the last commit";
|
|
37
|
+
export const diffIgnored = (value: string, reason: string) => `/diff ignored '${value}' — ${reason}`;
|
|
38
|
+
export const diffFailed = (reason: string) => `git diff failed: ${reason}`;
|
|
39
|
+
export const noChanges = (scope: string) => `${NO_CHANGES_MESSAGE} (${scope})`;
|
|
40
|
+
export const scopeLine = (scope: string) => `── ${scope}`;
|
|
41
|
+
export const argumentsIgnored = (count: number) => `${count} argument(s) ignored — see the log.`;
|
|
42
|
+
|
|
43
|
+
// /review and /passes
|
|
44
|
+
export const invalidPassCount = (token: string, min: number, max: number) =>
|
|
45
|
+
`invalid pass count '${token}' — expected an integer between ${min} and ${max}.`;
|
|
46
|
+
export const reviewUnknownOption = (token: string) =>
|
|
47
|
+
`review: unknown option '${token}' (--files, --commit, --lens, --passes)`;
|
|
48
|
+
export const reviewTakesValue = (name: string) => `review: ${name} takes a value`;
|
|
49
|
+
export const reviewLensTakes = (lenses: string, lens: string) => `review: --lens takes ${lenses}, not '${lens}'`;
|
|
50
|
+
export const passesShown = (current: string, min: number, max: number) =>
|
|
51
|
+
`reasoning passes: ${current}\n/review runs that many lens rounds.\n` +
|
|
52
|
+
`usage: /passes <${min}-${max}> (this session) or /review --passes <${min}-${max}> (one run)`;
|
|
53
|
+
export const passesSet = (n: number, calls: number) =>
|
|
54
|
+
`reasoning passes set to ${n} — /review will make ${calls} lens calls per run (session-scoped; /clear clears it).`;
|
|
@@ -10,6 +10,8 @@ import { MAX_PASSES, MIN_PASSES } from "../../../shared/domain/agent-policy/beha
|
|
|
10
10
|
import { PASSES_STATE_KEY } from "../../../shared/domain/session-keys.ts";
|
|
11
11
|
import { commandLine, splitWords } from "../args.ts";
|
|
12
12
|
import type { CommandView } from "../view.ts";
|
|
13
|
+
import { invalidPassCount, passesSet, passesShown, reviewLensTakes, reviewTakesValue, reviewUnknownOption } from "./messages.ts";
|
|
14
|
+
import { markedDefault as defaultPasses } from "../messages.ts";
|
|
13
15
|
|
|
14
16
|
export const REVIEW_LENSES: readonly string[] = ["correctness", "security", "style"];
|
|
15
17
|
|
|
@@ -32,7 +34,7 @@ export type ReviewRoute =
|
|
|
32
34
|
|
|
33
35
|
/** The refusal of a pass count that is not an integer from 1 to 5. */
|
|
34
36
|
export function invalidPassesText(token: string): string {
|
|
35
|
-
return
|
|
37
|
+
return invalidPassCount(token, MIN_PASSES, MAX_PASSES);
|
|
36
38
|
}
|
|
37
39
|
|
|
38
40
|
/** A pass count from 1 to 5, or null. */
|
|
@@ -69,10 +71,10 @@ export function parseReviewArgs(raw: readonly string[], typed: string): ReviewRo
|
|
|
69
71
|
continue;
|
|
70
72
|
}
|
|
71
73
|
if (name !== "--commit" && name !== "--lens" && name !== "--passes") {
|
|
72
|
-
return { route: "refused", text:
|
|
74
|
+
return { route: "refused", text: reviewUnknownOption(token) };
|
|
73
75
|
}
|
|
74
76
|
const value = inline ?? (i + 1 < tokens.length && !tokens[i + 1].startsWith("--") ? tokens[++i] : "");
|
|
75
|
-
if (value === "") return { route: "refused", text:
|
|
77
|
+
if (value === "") return { route: "refused", text: reviewTakesValue(name) };
|
|
76
78
|
if (name === "--commit") commit = value;
|
|
77
79
|
else if (name === "--lens") lens = value;
|
|
78
80
|
else {
|
|
@@ -83,7 +85,7 @@ export function parseReviewArgs(raw: readonly string[], typed: string): ReviewRo
|
|
|
83
85
|
}
|
|
84
86
|
if (typed === "security-review") lens = "security";
|
|
85
87
|
else if (lens !== "" && !REVIEW_LENSES.includes(lens)) {
|
|
86
|
-
return { route: "refused", text:
|
|
88
|
+
return { route: "refused", text: reviewLensTakes(REVIEW_LENSES.join(", "), lens) };
|
|
87
89
|
}
|
|
88
90
|
return { route: "review", input: { files, commit, lenses: lens, ...(passes === undefined ? {} : { passes }) } };
|
|
89
91
|
}
|
|
@@ -95,15 +97,12 @@ export interface PassesDeps {
|
|
|
95
97
|
/** `/passes [n]`: the session's pass count shown, or set from 1 to 5 (session-scoped; /clear clears it). */
|
|
96
98
|
export async function runPasses(token: string, deps: PassesDeps): Promise<CommandView> {
|
|
97
99
|
if (token === "") {
|
|
98
|
-
const current = (await deps.session.readState(PASSES_STATE_KEY).catch(() => null)) ??
|
|
99
|
-
return {
|
|
100
|
-
text: `reasoning passes: ${current}\n/review runs that many lens rounds.\n` +
|
|
101
|
-
`usage: /passes <${MIN_PASSES}-${MAX_PASSES}> (this session) or /review --passes <${MIN_PASSES}-${MAX_PASSES}> (one run)`,
|
|
102
|
-
};
|
|
100
|
+
const current = (await deps.session.readState(PASSES_STATE_KEY).catch(() => null)) ?? defaultPasses(MIN_PASSES);
|
|
101
|
+
return { text: passesShown(current, MIN_PASSES, MAX_PASSES) };
|
|
103
102
|
}
|
|
104
103
|
const n = passCount(token);
|
|
105
104
|
if (n === null) return { text: invalidPassesText(token) };
|
|
106
105
|
await deps.session.writeState(PASSES_STATE_KEY, String(n));
|
|
107
106
|
// n rounds × 3 lenses is n × 3 LLM calls: say so, the cost is the operator's.
|
|
108
|
-
return { text:
|
|
107
|
+
return { text: passesSet(n, n * 3) };
|
|
109
108
|
}
|
|
@@ -17,6 +17,11 @@ import { admitEntries, admitReport } from "../../../shared/application/shared-me
|
|
|
17
17
|
import { admissionProblem, asksConfirmation } from "../../../shared/domain/shared-memory/gate.ts";
|
|
18
18
|
import { candidatesList } from "../../../shared/domain/shared-memory/candidates.ts";
|
|
19
19
|
import { importAgentMemory, importReport } from "../../../shared/application/shared-memory/import-agent-memory.ts";
|
|
20
|
+
import {
|
|
21
|
+
ADMITTED_UNASKED, HEADLESS, IMPORT_TAKES_NOTHING, LEFT_AS_CANDIDATE, LIST_TAKES_NOTHING, NOTHING_ADMITTED,
|
|
22
|
+
NO_INGESTION_ON_REFUSAL, REFUSE_USAGE, admitQuestion, motifTooLong, noPendingCandidate, notACandidateId, notPending,
|
|
23
|
+
stoppedAt, unknownAdmitOption,
|
|
24
|
+
} from "./messages.ts";
|
|
20
25
|
|
|
21
26
|
/** The crew that writes an admission, launched exclusively: the host refuses an admission while the previous one is
|
|
22
27
|
* still being written, so two never write the shared memory side by side; the list, a refusal and the import launch
|
|
@@ -34,21 +39,21 @@ export type MemoryAdmitArgs =
|
|
|
34
39
|
|
|
35
40
|
export function parseMemoryAdmitArgs(tokens: readonly string[]): { ok: true; args: MemoryAdmitArgs } | { ok: false; text: string } {
|
|
36
41
|
if (tokens[0] === "--list") {
|
|
37
|
-
return tokens.length === 1 ? { ok: true, args: { kind: "list" } } : { ok: false, text:
|
|
42
|
+
return tokens.length === 1 ? { ok: true, args: { kind: "list" } } : { ok: false, text: LIST_TAKES_NOTHING };
|
|
38
43
|
}
|
|
39
44
|
if (tokens[0] === "--import") {
|
|
40
|
-
return tokens.length === 1 ? { ok: true, args: { kind: "import" } } : { ok: false, text:
|
|
45
|
+
return tokens.length === 1 ? { ok: true, args: { kind: "import" } } : { ok: false, text: IMPORT_TAKES_NOTHING };
|
|
41
46
|
}
|
|
42
47
|
if (tokens[0] === "--refuse") {
|
|
43
48
|
const id = tokens[1];
|
|
44
|
-
if (id === undefined || !ID.test(id)) return { ok: false, text:
|
|
49
|
+
if (id === undefined || !ID.test(id)) return { ok: false, text: REFUSE_USAGE };
|
|
45
50
|
const motif = tokens.slice(2).join(" ").replace(/\s+/g, " ").trim();
|
|
46
|
-
if (Array.from(motif).length > MAX_MOTIF_CHARS) return { ok: false, text:
|
|
51
|
+
if (Array.from(motif).length > MAX_MOTIF_CHARS) return { ok: false, text: motifTooLong(MAX_MOTIF_CHARS) };
|
|
47
52
|
return { ok: true, args: motif === "" ? { kind: "refuse", id } : { kind: "refuse", id, motif } };
|
|
48
53
|
}
|
|
49
54
|
for (const tok of tokens) {
|
|
50
|
-
if (tok.startsWith("--")) return { ok: false, text:
|
|
51
|
-
if (!ID.test(tok)) return { ok: false, text:
|
|
55
|
+
if (tok.startsWith("--")) return { ok: false, text: unknownAdmitOption(tok) };
|
|
56
|
+
if (!ID.test(tok)) return { ok: false, text: notACandidateId(tok) };
|
|
52
57
|
}
|
|
53
58
|
return { ok: true, args: { kind: "admit", ids: [...new Set(tokens)] } };
|
|
54
59
|
}
|
|
@@ -84,18 +89,11 @@ function candidateNotice(c: StoredEntry): string {
|
|
|
84
89
|
return [...lines, ...body.map((l) => ` | ${l}`)].join("\n");
|
|
85
90
|
}
|
|
86
91
|
|
|
87
|
-
const HEADLESS = "refused: /memory-admit asks before admitting and this session cannot prompt: no asked candidate was admitted. " +
|
|
88
|
-
"Run it in an interactive session (an audited candidate admits unasked when memory.autoAdmitAudited is true).";
|
|
89
|
-
|
|
90
92
|
/** No answer: the questions left are refused, the admissions already made - unasked or confirmed - still go. */
|
|
91
93
|
function headless(admit: Confirmed[], settings: MemorySettings, why: string): MemoryAdmitResult {
|
|
92
94
|
return admit.length === 0 ? { refused: why } : { admit, settings, refusedQuestions: why };
|
|
93
95
|
}
|
|
94
96
|
|
|
95
|
-
/** A question cancelled after another was answered: the session can prompt, the person stopped. */
|
|
96
|
-
const stoppedAt = (id: string): string =>
|
|
97
|
-
`refused: the question about ${id} got no answer: it and the candidates after it stay candidates. Run /memory-admit again for them.`;
|
|
98
|
-
|
|
99
97
|
export async function runMemoryAdmit(args: MemoryAdmitArgs, deps: MemoryAdmitDeps, io: MemoryAdmitIo): Promise<MemoryAdmitResult> {
|
|
100
98
|
const settings = await readMemorySettings(deps);
|
|
101
99
|
for (const warning of settings.warnings) io.writeLine(`warning: ${warning}`);
|
|
@@ -105,28 +103,28 @@ export async function runMemoryAdmit(args: MemoryAdmitArgs, deps: MemoryAdmitDep
|
|
|
105
103
|
}
|
|
106
104
|
const pending = await pendingCandidates(deps.files, settings.layout);
|
|
107
105
|
if (args.kind === "list") {
|
|
108
|
-
return { message: pending.length === 0 ?
|
|
106
|
+
return { message: pending.length === 0 ? noPendingCandidate(settings.layout.candidates) : candidatesList(pending.map((c) => c.entry)).trimEnd() };
|
|
109
107
|
}
|
|
110
108
|
if (args.kind === "refuse") {
|
|
111
|
-
const outcome = await admitEntries({ ...deps, memory: { ingest: async () => { throw new Error(
|
|
109
|
+
const outcome = await admitEntries({ ...deps, memory: { ingest: async () => { throw new Error(NO_INGESTION_ON_REFUSAL); } } },
|
|
112
110
|
settings, { admit: [], refuse: [{ id: args.id, ...(args.motif === undefined ? {} : { motif: args.motif }) }] });
|
|
113
111
|
return outcome.refused.length > 0 ? { message: admitReport(outcome) } : { refused: admitReport(outcome) };
|
|
114
112
|
}
|
|
115
113
|
const chosen: StoredEntry[] = [];
|
|
116
114
|
for (const id of args.ids) {
|
|
117
115
|
const hit = pending.find((c) => c.entry.id === id);
|
|
118
|
-
if (hit === undefined) io.writeLine(
|
|
116
|
+
if (hit === undefined) io.writeLine(notPending(id));
|
|
119
117
|
else chosen.push(hit);
|
|
120
118
|
}
|
|
121
119
|
const asked = args.ids.length === 0 ? pending : chosen;
|
|
122
|
-
if (asked.length === 0) return { message: args.ids.length === 0 ?
|
|
120
|
+
if (asked.length === 0) return { message: args.ids.length === 0 ? noPendingCandidate(settings.layout.candidates) : NOTHING_ADMITTED };
|
|
123
121
|
const admit: Confirmed[] = [];
|
|
124
122
|
const confirmed = (c: StoredEntry): Confirmed => ({ id: c.entry.id, sha1: sha1Hex(c.text) });
|
|
125
123
|
// The admissions that need no question first: a session that cannot prompt still applies them.
|
|
126
124
|
const unasked = asked.filter((c) => admissionProblem(c.entry) === undefined && !asksConfirmation(c.entry, settings.autoAdmitAudited));
|
|
127
125
|
for (const c of unasked) {
|
|
128
126
|
io.writeLine(candidateNotice(c));
|
|
129
|
-
io.writeLine(
|
|
127
|
+
io.writeLine(ADMITTED_UNASKED);
|
|
130
128
|
admit.push(confirmed(c));
|
|
131
129
|
}
|
|
132
130
|
let answered = false;
|
|
@@ -136,7 +134,7 @@ export async function runMemoryAdmit(args: MemoryAdmitArgs, deps: MemoryAdmitDep
|
|
|
136
134
|
if (problem !== undefined) { io.writeLine(` not admissible: ${problem}`); continue; }
|
|
137
135
|
let answer: unknown;
|
|
138
136
|
try {
|
|
139
|
-
answer = await io.confirm(
|
|
137
|
+
answer = await io.confirm(admitQuestion(c.entry.id));
|
|
140
138
|
} catch {
|
|
141
139
|
answer = undefined;
|
|
142
140
|
}
|
|
@@ -144,7 +142,7 @@ export async function runMemoryAdmit(args: MemoryAdmitArgs, deps: MemoryAdmitDep
|
|
|
144
142
|
if (typeof answer !== "boolean") return headless(admit, settings, answered ? stoppedAt(c.entry.id) : HEADLESS);
|
|
145
143
|
answered = true;
|
|
146
144
|
if (answer) admit.push(confirmed(c));
|
|
147
|
-
else io.writeLine(
|
|
145
|
+
else io.writeLine(LEFT_AS_CANDIDATE);
|
|
148
146
|
}
|
|
149
|
-
return admit.length === 0 ? { message:
|
|
147
|
+
return admit.length === 0 ? { message: NOTHING_ADMITTED } : { admit, settings };
|
|
150
148
|
}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import type { MemoryStore } from "../../../shared/application/ports.ts";
|
|
9
9
|
import { parseMemoryArgs } from "../args.ts";
|
|
10
10
|
import type { CommandView } from "../view.ts";
|
|
11
|
+
import { FEEDBACK_RECORDED, FEEDBACK_USAGE } from "./messages.ts";
|
|
11
12
|
|
|
12
13
|
export interface MemoryDeps {
|
|
13
14
|
memory: MemoryStore;
|
|
@@ -22,9 +23,9 @@ export function admitTokens(tokens: readonly string[], typed: string): string[]
|
|
|
22
23
|
|
|
23
24
|
/** `/feedback <text>`: a 'feedback' memory, the reply saying the agent replays it. */
|
|
24
25
|
async function runFeedback(tokens: string[], deps: MemoryDeps): Promise<CommandView> {
|
|
25
|
-
if (tokens.join(" ").trim() === "") return { text:
|
|
26
|
+
if (tokens.join(" ").trim() === "") return { text: FEEDBACK_USAGE };
|
|
26
27
|
await runMemory(["add", "feedback", ...tokens], deps);
|
|
27
|
-
return { text:
|
|
28
|
+
return { text: FEEDBACK_RECORDED };
|
|
28
29
|
}
|
|
29
30
|
|
|
30
31
|
/** `/memory [list|add|delete|get] …`, from the command's raw tokens; typed by its alias `feedback`, an add of a feedback. */
|