onnx.6: sync dev @ 0.25.0-beta.4 (curation dedup fix #1637), prepare 0.25.0-alpha.onnx.6#1642
Merged
Aaronontheweb merged 19 commits intoJul 14, 2026
Conversation
) Updated ModelContextProtocol package versions to use a variable for versioning. Signed-off-by: Aaron Stannard <[email protected]>
Co-authored-by: Aaron Stannard <[email protected]>
--- updated-dependencies: - dependency-name: MessagePack dependency-version: 3.1.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…tclaw-dev#1127) (netclaw-dev#1610) * fix(cli): model set/picker preserve hand-set modalities on re-set (netclaw-dev#1127) Re-selecting a model that is already configured wiped operator-set attributes on it. The write path rebuilt the Models[role] entry from scratch via ModelEntryWriter, which only writes modalities it was handed (a probe result). Modalities have no CLI input and can only be hand-edited, so a manual 'model set' (or a context-window tweak, or the TUI picker re-selecting the same model) passed null and silently deleted a hand-set InputModalities/OutputModalities — the concrete netclaw-dev#1127 loss. Add ModelEntryWriter.WriteRole, a non-destructive persist: when the role already points at the same (provider, modelId), preserve the existing modalities and context window the caller did not supply; switching to a different model still starts clean (old attributes belonged to the old model). Routed 'model set' and the TUI model manager through it. Verified against the shipped binary: on stock beta 0.25.0, 'model set main <same-model> --context-window N' wipes InputModalities; with this fix the same command preserves it. No config-shape or schema change, so this is fully backwards compatible. Tests: WriteRole_SameModelWithoutModalities_PreservesHandSetModalities, WriteRole_DifferentModel_DropsPreviousModelModalities. * fix(cli): make model-set metadata operator-owned; discovery never clobbers it Hardens the non-destructive `model set`/picker rewrite (netclaw-dev#1127) against every issue surfaced reviewing netclaw-dev#1610, and closes the loop on modality overrides. ContextWindow and modalities are documented to "take precedence over provider-reported capability detection", so they are now treated as operator-owned overrides with a single precedence rule: explicit operator input > existing stored value > probe. A fresh probe seeds a first-time set or a model switch but never overwrites a value already on disk. Changes: 1. ContextWindow clamp preserved on same-model re-set. WriteRole takes the explicit --context-window and the probe default separately; the old callers collapsed them (`contextWindow ?? discovered`), so probe/picker paths always passed a non-null value and the operator's clamp was overwritten on every re-selection. 2. Modalities are no longer silently overwritten by discovery. Previously a probe that reported modalities replaced a stored override (the netclaw-dev#1127 loss's twin); now the stored value wins, matching the field's "manual override bypasses detection" contract. 3. Operators can change/remove those overrides. Since discovery no longer edits them, add `--input-modalities`, `--output-modalities`, and `--clear-modalities` to `model set`. Explicit set replaces the stored value; clear removes it (runtime detection resolves). Supplying any of them (like --context-window) skips the probe as manual configuration. 4. Corrupt/legacy existing entry no longer aborts the command. ReadSameModelEntry guards the deserialize (catch JsonException): an unreadable entry (e.g. an unrecognized modality enum string) degrades to "nothing to preserve" and the command overwrites/repairs it. 5. No false-match on ModelReference defaults. Provider/ModelId default to the stock local-ollama model, so an entry omitting either key deserialized to that default and would false-match a re-set of the stock model; preservation now requires both keys. 6. Provenance not downgraded. A same-model re-set that did not re-resolve the ID (no probe → Manual) keeps a previously discovered origin (Live/Defaults); only a fresh discovery updates it. Tests: ModelEntryWriter unit coverage for each precedence path (clamp-over-probe, probe- does-not-override-existing-modalities, explicit set, clear-over-probe, first-time seeding, default-model false-match, corrupt-entry overwrite, provenance preserve/update) plus CLI end-to-end coverage for the new flags. Full CLI suite green; slopwatch clean; model-manager smoke tape passes. * fix(cli): harden model-set overrides + add --clear-context-window (netclaw-dev#1610) Addresses code-review findings on the non-destructive model-set change: - probe gate: only --context-window short-circuits the probe; a modality flag no longer skips model-existence validation and context-window discovery - preservation read: a corrupt modality enum string no longer discards a valid operator-owned ContextWindow (field-tolerant recovery) - arg parsing: missing flag values and unknown args fail loudly instead of being silently dropped - cleared modality is now sticky: discovery is hands-off once a same-model entry exists, so a later probe cannot resurrect a --clear-modalities removal - TryParseModalities rejects raw numeric strings (named flags only) - provenance: preserve a prior discovered origin on any non-Live re-set (was only guarding Manual) - new --clear-context-window flag to force window re-detection (symmetry with --clear-modalities) Also hardens LoadModelSelection: a corrupt/legacy config no longer crashes `model set` (repairs it) or `model list` (reports it cleanly) or the TUI. Generalizes ModalityOverride into a shared ValueOverride<T> tri-state. Updates netclaw-operations skill (providers.md). Docs website tracked in netclaw-dev/netclaw-website#83. * feat(config): preserve model definitions across role switches * fix(config): validate named model role references * fix(cli): preserve models when editing providers
) Bumps [dotnet-sdk](https://github.com/dotnet/sdk) from 10.0.300 to 10.0.301. - [Release notes](https://github.com/dotnet/sdk/releases) - [Commits](dotnet/sdk@v10.0.300...v10.0.301) --- updated-dependencies: - dependency-name: dotnet-sdk dependency-version: 10.0.301 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
netclaw-dev#1622) * Add deployment agent mission playbook * Keep identity routing in embedded guidance * Evaluate embedded identity routing * Prioritize specialized subagent guidance
…-dev#1634) * feat(skills): use logical skill access * docs(evals): restore README * test(skills): use root-preserving path joins
…ev#1630) * feat: preserve git context across subagents * fix: make subagent git context deterministic * test: make fixture path intent explicit
…etclaw-dev#1637) When a curation Create decision landed on an anchor that already had a document, both batch appliers reused the existing document_id, and the ON CONFLICT DO UPDATE overwrote that document's title, body, and classification with the new proposal. The old content was lost; there is no history table to recover it from. Now a Create collision appends the new content below a dated separator and keeps the existing title, boundary, audience, and sensitivity. If the incoming content is already present verbatim, the write is skipped. Consolidate decisions carry an explicit target document id, so they keep replacing near-duplicates as designed. Update decisions and no-collision inserts are unchanged.
Aaronontheweb
merged commit Jul 14, 2026
57fd0a1
into
netclaw-dev:feature/memory-embeddings
12 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges
upstream/dev(0.25.0-beta.4) intofeature/memory-embeddingsand bumps the experimental build to0.25.0-alpha.onnx.6. No embeddings-behavior changes — this is a mainline sync.Pulls in from dev: Git working-context preservation for sessions/subagents (#1630), user-written
AGENTS.md(#1622), curation dedup collision fix (#1637), STDIO MCP argument preservation (#1636), logical skill access refresh (#1634), SkillServer 0.4.0 stable (#1638).Conflict resolutions
VersionSuffixset toalpha.onnx.6;VersionPrefixunchanged (0.25.0, agreed both sides);PackageReleaseNotestakes dev's (newer) content.0.25.0-alpha.onnx.6section at the top.metadata.versionfrontmatter line conflicted (content edits on both sides were on non-overlapping lines and merged cleanly); set version to2.28.0(one above the higher side,2.27.0).ApplyConsolidatecall in full, dropped dev's one-lineMemoryId = decision.TargetDocumentIdfix.ApplyConsolidatealready derives an explicit primary target fromdecision.ConsolidationTargetIds ∩ candidates(confidence/freshness ordering) and routes throughApplyGuardedMergeOrAppend, which is a stricter, independently-validated version of what dev's fix achieves — dev's fix's actual payload (populatingTargetDocumentIdinCurationRulesEvaluator/CurationPromptBuilder) auto-merged in untouched but isn't even consumed byApplyConsolidate, which only readsConsolidationTargetIds. Result: Consolidate always writes into a named target via a guarded merge/append, never the anchor-collision path.Post-merge fix
MemoryCurationEvaluatorParityTests.ConsolidateDecision_appliedThroughStore_replacesExistingDocumentInsteadOfAppending(dev's test) called the pre-Slice-3 2-arg constructor/API and asserted a destructive "replace" outcome. Updated to the current constructor/CurationEvaluationAPI and rewrote the assertions for the reconciled semantics: deterministic-tier Consolidate has no synthesized merge body, so it always takes the lossless append branch (append-document, dated separator) into the explicit target document — renamed toConsolidateDecision_appliedThroughStore_writesGuardedAppendIntoExplicitTarget.Test plan
dotnet build— 0 warnings, 0 errorsdotnet test -c Release(full solution) — 6127 passed, 0 failed, 14 skipped (external-service integration tests: Mattermost, SkillServer container, AppHost smoke)dotnet slopwatch analyze— 0 issuespwsh ./scripts/Add-FileHeaders.ps1 -Verify— all files have headersDirectory.Build.props— VersionPrefix0.25.0, VersionSuffixalpha.onnx.6ApprovalBridge =invariant inSubAgentSpawner.cs— exactly 1 occurrence, fail-closed conditional intact