From 2d2ad27603464430d505035345cca5499d316f92 Mon Sep 17 00:00:00 2001 From: Jason Woltje Date: Tue, 20 Oct 2026 23:51:17 -0500 Subject: [PATCH] morgana: row 213 round 3 (sage-1715): rebase onto 9b5362018 over rows 199, 237 and 210; both sides kept in five conflicts; manifest rebuilt, six digests changed --- agents/morgana/work/queue-213/BUILD.md | 29 +++++++++++++++++++ agents/morgana/work/queue-213/base.txt | 2 +- .../work/queue-213/candidate-manifest.sha256 | 12 ++++---- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/agents/morgana/work/queue-213/BUILD.md b/agents/morgana/work/queue-213/BUILD.md index cad85d997..4fba9da1d 100644 --- a/agents/morgana/work/queue-213/BUILD.md +++ b/agents/morgana/work/queue-213/BUILD.md @@ -196,3 +196,32 @@ the named test files per mutant, restores each file after its mutant and again i - Drift: `git diff --stat 088087ac9 f41729178` over the 35 manifest paths is empty. Round 2 manifest digest b5ff0ac0e754cb1e5891417f4ab1da9597f5cf49fb2fe2d5f0fbf066f821c43a. + +## Round 3 (sage-1715): rebase onto 9b5362018 + +Rows 199 (cb5fdb064), 237 (d7d943199) and 210 (f5753c0e8) landed on six manifest paths after the round 2 +approval. Round 3 rebases the three commits onto origin/refactor 9b5362018 on a new branch, +`morgana/row213-r3`. The round 2 branch stays as it was. Nothing else changed. + +- Five files conflicted. Each resolution keeps both sides: + - `bus/src/broker.mjs` and `bus/tests/project-runtime.test.mjs`: the vocabulary import keeps rows 199 + and 210's names (forkProblem, forkUrl, credentialKind, validArgv, commandAllowed) and adds + CREATIVE_DEFINITIONS last. The pinned import line in the test carries the same list. RUNNER_FILES + is unchanged, since the import is still the vocabulary file only. + - `business/src/business.mjs`: one vocabulary import with row 199's names plus CREATIVE_DEFINITIONS. + The `checkRoles(roles, file, rolesDir, business, hosts)` signature is row 199's. `checkPersonaVars` + runs after row 199's identity and publish checks. + - `business/src/role.mjs`: the import keeps row 210's HOST_SERVICE and adds CREATIVE_DEFINITIONS and + CREATIVE_TOOLS. + - `business/src/vocabulary.mjs`: the creative constants and `END_PROTECTED = THREAD_DEFINITIONS` come + before row 199's Gitea URL parse, which is kept whole. +- `cli/src/launcher.mjs` merged without a conflict. +- `git range-diff 088087ac9..aee32d185 9b5362018..morgana/row213-r3`: commits 2 and 3 are `=`. Commit 1 + differs only in the conflict hunks above. +- None of the new base's added lines name END_PROTECTED, THREAD_DEFINITION, CREATIVE_* or the creative + refusal codes, apart from docs. All 31 mutant anchors still count 1. The hash-pin grep finds no + 64-hex pin on a manifest path. +- The manifest is rebuilt from the round 3 tree. It has the same 35 paths, and six digests changed: the + six drifted files. `base.txt` is 9b5362018. +- Singles of every touched test file, plus the seat sandbox and bus project-runtime tests (RUNNER_FILES + rule), wait on Sage's slot. They are recorded here when run. diff --git a/agents/morgana/work/queue-213/base.txt b/agents/morgana/work/queue-213/base.txt index 390d27504..1347b2dc2 100644 --- a/agents/morgana/work/queue-213/base.txt +++ b/agents/morgana/work/queue-213/base.txt @@ -1 +1 @@ -088087ac96e887646a76dbfa8202f11a2673e863 +9b536201855ea7e0158053d86a9abd364c6bd845 diff --git a/agents/morgana/work/queue-213/candidate-manifest.sha256 b/agents/morgana/work/queue-213/candidate-manifest.sha256 index c7ad26ad7..6ef3ee4bd 100644 --- a/agents/morgana/work/queue-213/candidate-manifest.sha256 +++ b/agents/morgana/work/queue-213/candidate-manifest.sha256 @@ -1,21 +1,21 @@ 37cc5d74636465c592c9eb8f3d9b66c2632299be922444737b32d3d3be43c239 adapters/claude/adapter.sh 1e0487ab682ff97e974a9fed4765994f70ee362058bd0aa6aee32c2a7891e0d2 adapters/pi/adapter.sh 2cb62d90f4f52f17ca606e57d4714b872520d0224cd94fd116308becee864b71 adapters/README.md -23fb1856e6c925c68f44a998b4617a480d2e9061b77e60fdeacd3619db95af1b packages/business/src/business.mjs +3c1e7e2d210075ca678c824e6722a1b3ffa07fb617cd903a1ee6559d16425738 packages/business/src/business.mjs a93b4efe213750b35730d6391594f3e26ffe667040a5d7baf5262b83341164b1 packages/business/src/instance-settings.mjs 3e957579bcfdf5f88e60f7235b7ead4fb27cb455e34b7588f4e22b8ab5542bec packages/business/src/launch-settings.mjs -9d3698ac66f3ed44644c5dbab01e33c4812f107d948d70970a64e746365e7dbe packages/business/src/role.mjs +6b84018c202ff08e59b4e946556703d199fe75ef97e9e6ac4a390c89705ac796 packages/business/src/role.mjs f6b15ee8dad2d985c0ae66b1f106ca46cb56ec86ac8cd5dec8a05c887596a421 packages/business/src/vars.mjs -33bcac072757355c89411c0f8380130b0ffb49563a451be9dc41d34f4d977541 packages/business/src/vocabulary.mjs +814ba93ca7403ad77ea2e7fb7bc21c2b40846bf8a3c2eae53b32446278af061c packages/business/src/vocabulary.mjs b67917c5c7bb270b82f1cbd97071a195b79a57c9a343acbc5feae2a877fb9e8f packages/business/tests/assistant.test.mjs b4606af3288624475e23ca506f7dea084a1e606efce4b1556d132b03230c2be1 packages/business/tests/business.test.mjs 2b80070db1e1d72b82a32cec75711c59a9383188b5a659854fd0ba8ae2dc0f5b packages/business/tests/instance-settings.test.mjs 647b4835836566070c7b859b2bbcaf3fd748030fe88c8f20e990f5038ec65e88 packages/business/tests/launch-settings.test.mjs 0c9f082d8c05582382dc646c74aa60a46b89804717f828db9fadde51f2e258a8 packages/business/tests/role.test.mjs -9169b8832ae1a0a0862198a930d421ce151a610e1a2e6a79dcd25df70cefd386 packages/bus/src/broker.mjs +9740a92a0a47ea3a0628fd933d7ef1117ffa9a75bb400685f200e913f768982a packages/bus/src/broker.mjs 21946cdecab263ae65791977eb4599594340c8e049b3c216e3181610638f0952 packages/bus/tests/creative.test.mjs -b8b1e4229472ee1986a3072d9745e711ee49a5fd15a7445ddcd294998b5f677a packages/bus/tests/project-runtime.test.mjs -b530ae2aba9a1d47e62d4271558bd69f8f6905dca42141a87fb18fd70f5ddc0f packages/cli/src/launcher.mjs +747bbd77fc85a01ad4b44a58205cc00ff655c18653869257c051299b71d906ff packages/bus/tests/project-runtime.test.mjs +a968a19d1b32416aecb2488c7fb9768db7d5160374f1b790166380d41acea894 packages/cli/src/launcher.mjs 7933f256e5f097999ff36cc7e48b0c417385c6c3727919f38437bd501aecc438 packages/cli/tests/launcher.test.mjs 2c1aad8d8be1a03be12eca93b4da36c656236ad38d09bfdc314e42a68240afc3 packages/harness/src/bundle.mjs 22f9e3c1dce25e5eb6713306ccdf22dc77a4ccf0c99e9186f2e16602f58aeb49 packages/harness/src/tools.mjs