merge: resolve conflicts keeping all content from both sides

Author: mdheller

Makefile

@@ -75,6 +75,7 @@ validate-activation:
 	$(PYTHON) scripts/validate-activation.py
 	$(PYTHON) scripts/evaluate-activation.py $(LOCAL_AGENTPOD) $(READY_POLICY) $(READY_GRANT) --deployment-receipt-id $(DEPLOYMENT_RECEIPT_ID) --storage-receipt-dir examples --decided-at $(DECIDED_AT) --decision-id urn:srcos:agent-machine:activation-decision:local-llama-cpp-allowed --pretty >/tmp/agent-machine-evaluate-activation-allowed.json
 	$(PYCLI) activate evaluate $(LOCAL_AGENTPOD) $(FAIL_POLICY) $(FAIL_GRANT) --deployment-receipt-id $(DEPLOYMENT_RECEIPT_ID) --storage-receipt-dir $(RECEIPT_DIR) --decided-at $(DECIDED_AT) --decision-id urn:srcos:agent-machine:activation-decision:local-llama-cpp-fail-closed --pretty >/tmp/agent-machine-pycli-evaluate-activation-fail-closed.json
+	$(BOOTSTRAP_CLI) activate evaluate $(LOCAL_AGENTPOD) $(READY_POLICY) $(READY_GRANT) --deployment-receipt-id $(DEPLOYMENT_RECEIPT_ID) --storage-receipt-dir $(RECEIPT_DIR) --decided-at $(DECIDED_AT) --decision-id urn:srcos:agent-machine:activation-decision:local-llama-cpp-allowed --pretty >/tmp/agent-machine-bootstrap-evaluate-activation-allowed.json
 	$(PYCLI) activate evaluate $(LOCAL_AGENTPOD) $(READY_GRANT) --policy-dir $(POLICY_DIR) --expected-status allowed --deployment-receipt-id $(DEPLOYMENT_RECEIPT_ID) --agent-machine-id urn:srcos:agent-machine:m2-asahi-local --provider-id urn:srcos:agent-machine:inference-provider:asahi-llama-cpp --storage-receipt-dir $(RECEIPT_DIR) --decided-at $(DECIDED_AT) --decision-id urn:srcos:agent-machine:activation-decision:local-llama-cpp-allowed --pretty >/tmp/agent-machine-pycli-resolved-policy-activation-allowed.json
 	$(PYCLI) activate evaluate $(LOCAL_AGENTPOD) --policy-dir $(POLICY_DIR) --expected-status allowed --grant-dir $(GRANT_DIR) --grant-id urn:srcos:agent-machine:agent-registry-grant:active-loopback-activation --session-ref urn:srcos:session:local-bootstrap --deployment-receipt-id $(DEPLOYMENT_RECEIPT_ID) --agent-machine-id urn:srcos:agent-machine:m2-asahi-local --provider-id urn:srcos:agent-machine:inference-provider:asahi-llama-cpp --storage-receipt-dir $(RECEIPT_DIR) --decided-at $(DECIDED_AT) --decision-id urn:srcos:agent-machine:activation-decision:local-llama-cpp-allowed --pretty >/tmp/agent-machine-pycli-resolved-policy-grant-activation-allowed.json
 	$(BOOTSTRAP_CLI) activate evaluate $(LOCAL_AGENTPOD) $(READY_POLICY) $(READY_GRANT) --deployment-receipt-id $(DEPLOYMENT_RECEIPT_ID) --storage-receipt-dir $(RECEIPT_DIR) --decided-at $(DECIDED_AT) --decision-id urn:srcos:agent-machine:activation-decision:local-llama-cpp-allowed --pretty >/tmp/agent-machine-bootstrap-evaluate-activation-allowed.json
@@ -105,6 +106,7 @@ validate-cli:
 	$(PYCLI) steer preflight --sourceset gpt2-small.res-jb --pretty >/tmp/agent-machine-pycli-steer-preflight.json
 	$(BOOTSTRAP_CLI) steer preflight --sourceset gpt2-small.res-jb --pretty >/tmp/agent-machine-bootstrap-steer-preflight.json
 	$(PYCLI) steer resolve-artifacts --sourceset gpt2-small.res-jb --local-dir /tmp/agent-machine-steering-artifacts --receipt-out /tmp/agent-machine-steering-artifact-receipt.json --dry-run --pretty >/tmp/agent-machine-pycli-artifact-receipt.json
+	$(PYTHON) scripts/verify-steering-receipt.py examples/steering-artifact-receipts/gpt2-small-res-jb.missing.steering-artifact-receipt.json --expect-status not_configured --pretty >/tmp/agent-machine-steering-load-preflight.json
 	$(PYTHON) scripts/verify-steering-receipt.py examples/steering-artifact-receipts/gpt2-small-res-jb.missing.steering-artifact-receipt.json --expect-status not_configured --pretty >/tmp/agent-machine-steering-verify-preflight.json
 	$(PYTHON) scripts/load-steering-receipt.py examples/steering-artifact-receipts/synthetic.available.steering-artifact-receipt.json --attempt-load --pretty >/tmp/agent-machine-steering-synthetic-load.json
 	$(PYTHON) scripts/run-mock-steering.py /tmp/agent-machine-steer-request.json --pretty >/tmp/agent-machine-mock-steering.json
@@ -123,4 +125,5 @@ doctor:
 	$(BOOTSTRAP_CLI) doctor --format json
 
 probe:
-	$(BOOTSTRAP_CLI) probe --format json
+	$(BOOTSTRAP_CLI) probe --format json
+	$(BOOTSTRAP_CLI) probe --format json

contracts/external-trust-signal-provider.schema.json

@@ -5,6 +5,14 @@
   "description": "Secret-free adapter request/response contract for optional non-authoritative external identity, reputation, certificate-tier, counterparty, and registry lookup signals used as Agent Registry verifier inputs.",
   "type": "object",
   "additionalProperties": false,
+  "required": ["specVersion", "id", "kind", "request", "response", "receiptSafety", "observedAt"],
+  "$defs": {
+    "signalType": {
+      "type": "string",
+      "enum": ["agent-identity", "cert-tier", "reputation-score", "counterparty-check", "registry-lookup", "other"]
+    },
+    "sha256Digest": {
+      "type": ["string", "null"],
   "required": [
     "specVersion",
     "id",
@@ -36,6 +44,11 @@
     "freshness": {
       "type": "object",
       "additionalProperties": false,
+      "required": ["maxAgeSeconds", "observedAgeSeconds", "fresh"],
+      "properties": {
+        "maxAgeSeconds": { "type": "integer", "minimum": 0 },
+        "observedAgeSeconds": { "type": "integer", "minimum": 0 },
+        "fresh": { "type": "boolean" }
       "required": [
         "maxAgeSeconds",
         "observedAgeSeconds",
@@ -58,6 +71,12 @@
     "signature": {
       "type": "object",
       "additionalProperties": false,
+      "required": ["required", "observed", "signatureRef", "signerRef"],
+      "properties": {
+        "required": { "type": "boolean" },
+        "observed": { "type": "boolean" },
+        "signatureRef": { "type": ["string", "null"] },
+        "signerRef": { "type": ["string", "null"] }
       "required": [
         "required",
         "observed",
@@ -88,6 +107,18 @@
     "externalTrustSignal": {
       "type": "object",
       "additionalProperties": false,
+      "required": ["providerRef", "signalType", "signalRef", "signalDigest", "verifiedAt", "freshness", "signature", "authority", "failureReason"],
+      "properties": {
+        "providerRef": { "type": "string" },
+        "signalType": { "$ref": "#/$defs/signalType" },
+        "signalRef": { "type": "string" },
+        "signalDigest": { "$ref": "#/$defs/sha256Digest" },
+        "verifiedAt": { "type": "string" },
+        "freshness": { "$ref": "#/$defs/freshness" },
+        "signature": { "$ref": "#/$defs/signature" },
+        "authority": { "type": "string", "const": "non-authoritative-verifier-input" },
+        "failureReason": { "type": ["string", "null"] },
+        "notes": { "type": "array", "items": { "type": "string" } }
       "required": [
         "providerRef",
         "signalType",
@@ -141,6 +172,7 @@
     }
   },
   "properties": {
+    "specVersion": { "type": "string", "const": "0.1.0" },
     "specVersion": {
       "type": "string",
       "const": "0.1.0"
@@ -149,6 +181,14 @@
       "type": "string",
       "pattern": "^urn:srcos:agent-machine:external-trust-signal-provider:[a-z0-9][a-z0-9-]*$"
     },
+    "kind": { "type": "string", "const": "ExternalTrustSignalProvider" },
+    "request": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["requestId", "providerRef", "agentPodId", "requestedAgentIdentityRef", "sessionRef", "workroomRef", "topicRef", "requestedSignalTypes", "verificationFreshnessSeconds", "requestedExpiresAt", "signatureRequired"],
+      "properties": {
+        "requestId": { "type": "string" },
+        "providerRef": { "type": "string" },
     "kind": {
       "type": "string",
       "const": "ExternalTrustSignalProvider"
@@ -180,6 +220,19 @@
           "type": "string",
           "pattern": "^urn:srcos:agent-machine:agent-pod:[a-z0-9][a-z0-9-]*$"
         },
+        "requestedAgentIdentityRef": { "type": "string" },
+        "sessionRef": { "type": "string" },
+        "workroomRef": { "type": ["string", "null"] },
+        "topicRef": { "type": ["string", "null"] },
+        "requestedSignalTypes": {
+          "type": "array",
+          "items": { "$ref": "#/$defs/signalType" },
+          "minItems": 1,
+          "uniqueItems": true
+        },
+        "verificationFreshnessSeconds": { "type": "integer", "minimum": 0 },
+        "requestedExpiresAt": { "type": ["string", "null"] },
+        "signatureRequired": { "type": "boolean" }
         "requestedAgentIdentityRef": {
           "type": "string"
         },
@@ -224,6 +277,22 @@
     "response": {
       "type": "object",
       "additionalProperties": false,
+      "required": ["status", "usableForGrantResolution", "providerRef", "authority", "verifiedAt", "freshness", "signals", "failureReason"],
+      "properties": {
+        "status": {
+          "type": "string",
+          "enum": ["available", "unavailable", "stale", "malformed", "unsigned", "denied", "error"]
+        },
+        "usableForGrantResolution": { "type": "boolean" },
+        "providerRef": { "type": "string" },
+        "authority": { "type": "string", "const": "non-authoritative-verifier-input" },
+        "verifiedAt": { "type": ["string", "null"] },
+        "freshness": { "$ref": "#/$defs/freshness" },
+        "signals": {
+          "type": "array",
+          "items": { "$ref": "#/$defs/externalTrustSignal" }
+        },
+        "failureReason": { "type": ["string", "null"] }
       "required": [
         "status",
         "usableForGrantResolution",
@@ -283,6 +352,21 @@
     "receiptSafety": {
       "type": "object",
       "additionalProperties": false,
+      "required": ["includeRawContent", "rawPromptContentIncluded", "rawKvCacheContentIncluded", "secretValuesIncluded", "privateMemoryIncluded", "apiKeysIncluded", "walletPrivateKeysIncluded", "rawCredentialsIncluded", "rawUserDataIncluded"],
+      "properties": {
+        "includeRawContent": { "type": "boolean", "const": false },
+        "rawPromptContentIncluded": { "type": "boolean", "const": false },
+        "rawKvCacheContentIncluded": { "type": "boolean", "const": false },
+        "secretValuesIncluded": { "type": "boolean", "const": false },
+        "privateMemoryIncluded": { "type": "boolean", "const": false },
+        "apiKeysIncluded": { "type": "boolean", "const": false },
+        "walletPrivateKeysIncluded": { "type": "boolean", "const": false },
+        "rawCredentialsIncluded": { "type": "boolean", "const": false },
+        "rawUserDataIncluded": { "type": "boolean", "const": false }
+      }
+    },
+    "observedAt": { "type": "string" },
+    "labels": { "type": "object", "additionalProperties": { "type": "string" } }
       "required": [
         "includeRawContent",
         "rawPromptContentIncluded",

docs/index.md

@@ -32,6 +32,7 @@ Agent Machine is a bootstrap runtime-control substrate for SourceOS agent worklo
 | [AgentRegistryGrant resolution](architecture/agent-registry-grant-resolution.md) | Local Agent Registry grant resolver and fail-closed missing-grant behavior. |
 | [Image digest pinning and provenance](architecture/image-digest-pinning-and-provenance.md) | Supply-chain strict-mode gate for digest-pinned release-candidate artifacts. |
 | [Release evidence bundle](architecture/release-evidence-bundle.md) | Deterministic validation/source/inventory/render/supply-chain/readiness bundle. |
+| [Signed release bundle envelope](architecture/signed-release-bundle-envelope.md) | Signing envelope contract for release evidence bundles. |
 | [Signed release bundle envelope](architecture/signed-release-bundle-envelope.md) | Signing/verification envelope around a release evidence bundle. |
 | [Runtime package layout](architecture/runtime-package-layout.md) | Migration from loose scripts to `src/agent_machine/` package modules. |
 | [Homebrew Python dependencies](architecture/homebrew-python-dependencies.md) | Current dependency strategy for render/evaluation commands. |
@@ -133,4 +134,5 @@ Current blockers:
 - TopoLVM runtime integration beyond skeleton manifests;
 - provider discovery and controlled provider activation implementation;
 - M2 Asahi host measurement/provider readiness data;
-- rollback, teardown, and wipe workflows.
+- rollback, teardown, and wipe workflows.
+- rollback, teardown, and wipe workflows.

docs/inference-local-steering.md

@@ -1,11 +1,25 @@
 # Local SAE Steering Inference Readiness
 
+Status: inspection record for Issue #31. This document records current repository evidence for a Neuronpedia-compatible local steering path. It does not implement an inference server and does not claim runtime readiness.
 Status: inspection and registration record. This document records current repository evidence for a Neuronpedia-compatible local steering path. It does not implement an inference server and does not claim runtime readiness.
 
 ## Summary verdict
 
 Agent Machine is not currently ready to run local SAE steering for `MODEL_SOURCESET=gpt2-small.res-jb`.
 
+The repository has a backend-neutral `InferenceProvider` contract and a probe-only `llama.cpp` provider example, but no current repository artifact registers:
+
+- `MODEL_SOURCESET=gpt2-small.res-jb`
+- GPT-2 Small SAE artifacts
+- Gemma 2B or Gemma 9B steering sourcesets
+- a Neuronpedia-compatible `POST /steer` endpoint
+- an activation command that starts a steering inference server
+
+This is consistent with the repository status: provider activation is explicitly not implemented, and production readiness remains blocked by provider discovery and controlled provider activation.
+
+## Repository evidence inspected
+
+Inspected on 2026-05-20 against `main` at commit `c306852f26f4fbe62421a9b7801a59815d4daf9e`.
 The repository now has:
 
 - a backend-neutral `InferenceProvider` contract
@@ -32,6 +46,9 @@ Relevant repository evidence:
 - `README.md` describes Agent Machine as a bootstrap runtime-control substrate and marks provider activation as not implemented.
 - `BOOTSTRAP_STATUS.md` states activation remains dry-run control-plane evaluation and does not start a provider.
 - `docs/index.md` lists `InferenceProvider` as a contract family but keeps production blocked by provider discovery and controlled activation.
+- `contracts/inference-provider.schema.json` defines backend-neutral provider metadata and API surfaces such as OpenAI-compatible chat/completions/embeddings and native HTTP. It does not define a Neuronpedia-compatible `/steer` API surface.
+- `examples/asahi-llama-cpp.inference-provider.json` is `status: probe-only`, uses `llama.cpp`, and exposes an endpoint/health path for `llama-server`; it is not a steering server.
+- Repository search found no current references to `MODEL_SOURCESET`, `gpt2-small`, `res-jb`, `Gemma`, or `/steer` as implemented local steering surfaces.
 - `contracts/inference-provider.schema.json` defines backend-neutral provider metadata and API surfaces such as OpenAI-compatible chat/completions/embeddings and native HTTP.
 - `examples/asahi-llama-cpp.inference-provider.json` is `status: probe-only`, uses `llama.cpp`, and exposes an endpoint/health path for `llama-server`; it is not a steering server.
 - `docs/local-steer-endpoint.md` defines the local `/steer` contract and stub behavior.
@@ -42,6 +59,9 @@ Relevant repository evidence:
 
 | Sourceset | Current repo status | Ready today? | Reason |
 | --- | --- | --- | --- |
+| `gpt2-small.res-jb` | Not registered | No | No sourceset manifest, no GPT-2 Small SAE artifact reference, no `/steer` endpoint, and no activation path. |
+| Gemma 2B | Not registered | No | No Gemma sourceset manifest, no SAE artifact reference, no `/steer` endpoint, and no activation path. |
+| Gemma 9B | Not registered | No | No Gemma sourceset manifest, no SAE artifact reference, no `/steer` endpoint, and no activation path. |
 | `gpt2-small.res-jb` | Registered by reference | No | Sourceset record exists, but artifact digests, storage receipts, policy/grant admission, activation injection, and smoke proof are missing. |
 | `gemma-2-2b.pt-res` | Registered by reference, access-sensitive | No | Sourceset record exists, but model terms/access, artifact digests, storage receipts, policy/grant admission, activation injection, and smoke proof are missing. |
 | Gemma 9B | Not registered | No | Not admitted in Issue #33; register only after hardware/runtime profile and access posture are settled. |
@@ -55,6 +75,17 @@ Model weights:
 - Hugging Face model: `openai-community/gpt2`
 - Public model page: `https://huggingface.co/openai-community/gpt2`
 - Observed license on model page: MIT
+- Access posture observed from the public page: no account-gating was evident during inspection
+
+Still required before readiness:
+
+- explicit Agent Machine sourceset record for `gpt2-small.res-jb`
+- exact GPT-2 Small model artifact reference and digest policy
+- exact SAE artifact source and digest policy
+- runtime storage/cache placement receipts
+- activation policy and agent-registry grant examples for the steering provider
+
+### Gemma 2B / Gemma 9B
 
 SAE artifacts:
 
@@ -78,6 +109,22 @@ Model weights:
 
 - Hugging Face model: `google/gemma-2-2b`
 - Public model page: `https://huggingface.co/google/gemma-2-2b`
+- Hugging Face model: `google/gemma-2-9b`
+- Public model page: `https://huggingface.co/google/gemma-2-9b`
+- Observed license on model pages: Gemma license
+
+Access posture:
+
+- Treat Gemma access as terms-sensitive until an operator verifies availability under the relevant Hugging Face account and accepts any required Google terms.
+- Do not claim Gemma readiness from public model-card existence alone.
+
+Still required before readiness:
+
+- explicit Agent Machine sourceset record for each Gemma target admitted to scope
+- exact model artifact references and digest policies
+- exact SAE artifact sources and digest policies
+- hardware/runtime profile decision for Gemma model size
+- activation policy and grant examples
 - License/access: Gemma terms; operator must verify account access and accept applicable terms before runtime use.
 
 SAE artifacts:
@@ -138,6 +185,7 @@ Allowed status values must align with Noetica steering semantics:
 - `not_configured`: required model/source/SAE/backend configuration is absent.
 - `noop`: the endpoint accepted the request shape but deliberately applied no runtime intervention.
 
+This endpoint shape is a target contract. It is not implemented in Agent Machine at the time of this inspection.
 Issue #32 provides a stub endpoint that can return `not_configured` or `noop`. `applied` remains blocked on Issue #34.
 
 ## Current Agent Machine commands
@@ -157,13 +205,29 @@ Local endpoint contract stub from Issue #32:
 ```bash
 agent-machine steer serve-stub --host 127.0.0.1 --port 8080 --status not_configured
 ```
-
 Current validation command:
 
 ```bash
 make validate
 ```
 
+No current Agent Machine command was found that starts a Neuronpedia-compatible local `/steer` server.
+
+## Follow-up issues opened
+
+- Issue #32: define the Neuronpedia-compatible local `/steer` endpoint contract.
+- Issue #33: register local steering sourcesets for GPT-2 Small and Gemma.
+- Issue #34: implement controlled activation for a local steering inference provider after endpoint and sourceset records exist.
+
+## Readiness conclusion
+
+Current status: not ready.
+
+`MODEL_SOURCESET=gpt2-small.res-jb` is not loadable today from the repository state. The self-hosted M2b path requires at least:
+
+1. local `/steer` contract definition
+2. sourceset registration
+3. model and SAE artifact references with digest policy
 ## Follow-up issues
 
 - Issue #32: local `/steer` endpoint contract — closed.
@@ -183,4 +247,5 @@ Current status: registered but not loadable.
 5. evidence and grant wiring
 6. successful local smoke record
 
+Until those are complete, Noetica should use `NEURONPEDIA_BASE_URL=http://localhost:<port>` only as a configurable endpoint target for future experiments, not as proof that Agent Machine can already perform local SAE steering.
 Until those are complete, Noetica should use `NEURONPEDIA_BASE_URL=http://localhost:<port>` only as a configurable endpoint target for contract and UI testing, not as proof that Agent Machine can already perform local SAE steering.