@kontourai/flow-agents 1.1.0 → 1.3.0

package/evals/integration/test_goal_fit_hook.sh

@@ -473,6 +473,150 @@ else
   _fail "promoted doc is missing source or acceptance sections"
 fi
 
+# --- npm-install regression: validator-environment errors must not block goal-fit ---
+# Simulate the npm-installed condition: build/ is present (always shipped in package files)
+# but tsc is absent from PATH, so `npm run workflow:validate-artifacts` (which rebuilds)
+# would fail. The fix directly invokes node build/.../validate-workflow-artifacts.js instead.
+
+NPM_INSTALL_REPO="$TMPDIR_EVAL/npm-install-repo"
+mkdir -p "$NPM_INSTALL_REPO/.flow-agents/npm-install-task"
+printf '# Test Repo\n' > "$NPM_INSTALL_REPO/AGENTS.md"
+
+cat > "$NPM_INSTALL_REPO/.flow-agents/npm-install-task/npm-install-task--deliver.md" <<'MARKDOWN'
+# npm install test task
+
+branch: main
+worktree: main
+created: 2026-06-01
+status: delivered
+type: deliver
+
+## Definition Of Done
+- **User outcome:** Something works.
+- **Acceptance criteria:**
+  - [x] Thing works - Evidence: tested
+
+## Goal Fit Gate
+- [x] Original user goal restated
+- [x] Every acceptance criterion has evidence
+
+## Verification Report
+
+### Verdict: PASS
+
+## Final Acceptance
+
+- [ ] CI passed
+MARKDOWN
+
+cat > "$NPM_INSTALL_REPO/.flow-agents/npm-install-task/state.json" <<'JSON'
+{
+  "schema_version": "1.0",
+  "task_slug": "npm-install-task",
+  "status": "delivered",
+  "phase": "done",
+  "updated_at": "2026-06-01T00:00:00Z",
+  "next_action": { "status": "done", "summary": "Local delivery complete." }
+}
+JSON
+
+cat > "$NPM_INSTALL_REPO/.flow-agents/npm-install-task/acceptance.json" <<'JSON'
+{
+  "schema_version": "1.0",
+  "task_slug": "npm-install-task",
+  "criteria": [
+    {
+      "id": "thing-works",
+      "description": "Thing works.",
+      "status": "pass",
+      "evidence_refs": [
+        { "kind": "artifact", "file": "npm-install-task--deliver.md", "summary": "Delivery artifact." }
+      ]
+    }
+  ],
+  "goal_fit": { "status": "pass", "summary": "User outcome achieved." }
+}
+JSON
+
+cat > "$NPM_INSTALL_REPO/.flow-agents/npm-install-task/evidence.json" <<'JSON'
+{
+  "schema_version": "1.0",
+  "task_slug": "npm-install-task",
+  "verdict": "pass",
+  "checks": [
+    { "id": "build", "kind": "test", "status": "pass", "summary": "Build passed." }
+  ],
+  "not_verified_gaps": []
+}
+JSON
+
+cat > "$NPM_INSTALL_REPO/.flow-agents/npm-install-task/handoff.json" <<'JSON'
+{
+  "schema_version": "1.0",
+  "task_slug": "npm-install-task",
+  "summary": "Local delivery complete.",
+  "current_state_ref": "state.json",
+  "next_steps": [],
+  "blockers": [],
+  "warnings": []
+}
+JSON
+
+# Part 1 of fix: invoke the already-built validator directly (no tsc).
+# Poison tsc so that any call to it fails; confirm the hook does not call it
+# and validates clean sidecars successfully.
+FAKE_TSC_DIR="$TMPDIR_EVAL/fake-tsc"
+mkdir -p "$FAKE_TSC_DIR"
+printf '#!/usr/bin/env bash\necho "error TS5023: tsc should not be called" >&2\nexit 1\n' > "$FAKE_TSC_DIR/tsc"
+chmod +x "$FAKE_TSC_DIR/tsc"
+
+if PATH="$FAKE_TSC_DIR:$PATH" FLOW_AGENTS_GOAL_FIT_STRICT=true FLOW_AGENTS_REQUIRE_SIDECARS=true \
+     node "$ROOT/scripts/hooks/stop-goal-fit.js" \
+     >"$TMPDIR_EVAL/npm-install-valid.out" 2>"$TMPDIR_EVAL/npm-install-valid.err" <<JSON
+{"hook_event_name":"Stop","cwd":"$NPM_INSTALL_REPO"}
+JSON
+then
+  _pass "strict hook with poisoned tsc uses built validator and does not block valid sidecars"
+else
+  _fail "strict hook should not block valid sidecars even with tsc absent: $(cat "$TMPDIR_EVAL/npm-install-valid.err")"
+fi
+
+if ! rg -q 'tsc: command not found\|TS5023\|tsc should not be called' "$TMPDIR_EVAL/npm-install-valid.err"; then
+  _pass "hook does not emit tsc error noise when using built validator"
+else
+  _fail "hook leaked tsc error into goal-fit output"
+fi
+
+# Part 2 of fix: when the validator cannot run at all (build/ absent and npm fails),
+# the hook must skip cleanly — never block in strict mode due to an env error.
+mv "$ROOT/build" "$ROOT/build-absent"
+
+SPAWN_FAIL_DIR="$TMPDIR_EVAL/spawn-fail"
+mkdir -p "$SPAWN_FAIL_DIR"
+printf '#!/usr/bin/env bash\necho "npm ERR! tsc: command not found" >&2\nexit 127\n' > "$SPAWN_FAIL_DIR/npm"
+chmod +x "$SPAWN_FAIL_DIR/npm"
+
+if PATH="$SPAWN_FAIL_DIR:$PATH" FLOW_AGENTS_GOAL_FIT_STRICT=true FLOW_AGENTS_REQUIRE_SIDECARS=true \
+     node "$ROOT/scripts/hooks/stop-goal-fit.js" \
+     >"$TMPDIR_EVAL/npm-install-env-err.out" 2>"$TMPDIR_EVAL/npm-install-env-err.err" <<JSON
+{"hook_event_name":"Stop","cwd":"$NPM_INSTALL_REPO"}
+JSON
+then
+  _pass "strict hook does not block when validator environment fails (build/ absent, tsc missing)"
+else
+  _fail "strict hook must not block when validator env fails: $(cat "$TMPDIR_EVAL/npm-install-env-err.err")"
+fi
+
+if rg -q 'sidecar validation skipped' "$TMPDIR_EVAL/npm-install-env-err.err"; then
+  _pass "hook emits sidecar validation skipped warning for environment errors"
+else
+  _fail "hook did not emit 'sidecar validation skipped' for environment errors"
+fi
+
+# Restore build/ so subsequent evals are unaffected.
+mv "$ROOT/build-absent" "$ROOT/build"
+
+
 if [[ "$errors" -eq 0 ]]; then
   echo "Goal Fit hook integration passed."
   exit 0

package/evals/integration/test_kit_conformance_levels.sh

@@ -23,7 +23,7 @@ run_inspect() {
   local output="$2"
   # Route through the main CLI to avoid import.meta.url path-resolution issues.
   flow_agents_build_ts 2>/dev/null
-  node "$FLOW_AGENTS_EVAL_ROOT/build/src/cli.js" flow-kit inspect "$kit_dir" >"$output" 2>&1
+  node "$FLOW_AGENTS_EVAL_ROOT/build/src/cli.js" kit inspect "$kit_dir" >"$output" 2>&1
 }
 
 # ===================================================================
@@ -164,7 +164,7 @@ run_inspect "$ROOT/kits/builder" "$out" || true
 if node -e "
 const d = require('fs').readFileSync('$out', 'utf8');
 const r = JSON.parse(d);
-const required = ['kit_id','kit_name','conformance','targets','third_party_extensions'];
+const required = ['kit_id','kit_name','conformance','targets','third_party_extensions','trust'];
 for (const k of required) {
   if (!(k in r)) throw new Error('missing key: ' + k);
 }
@@ -199,6 +199,60 @@ else
   cat "$out"
 fi
 
+# ===================================================================
+echo ""
+echo "=== 8. Trust axis: first-party allowlist (builder and knowledge) ==="
+# ===================================================================
+
+for kit_name in builder knowledge; do
+  out="$TMP_DIR/trust-${kit_name}.out"
+  run_inspect "$ROOT/kits/$kit_name" "$out" || true
+  trust=$(node -e "const d=require('fs').readFileSync('$out','utf8'); console.log(JSON.parse(d).trust)" 2>/dev/null)
+  if [[ "$trust" == "first-party" ]]; then
+    pass "$kit_name kit trust: first-party (in Kontour allowlist)"
+  else
+    fail "$kit_name kit trust: expected first-party, got '$trust'"
+    cat "$out"
+  fi
+done
+
+# ===================================================================
+echo ""
+echo "=== 9. Trust axis: unverified for third-party and fixture kits ==="
+# ===================================================================
+
+for fixture in k0-flows-only k1-agent-extension k2-with-evals third-party-extension; do
+  out="$TMP_DIR/trust-${fixture}.out"
+  run_inspect "$ROOT/evals/fixtures/kit-conformance-levels/$fixture" "$out" || true
+  trust=$(node -e "const d=require('fs').readFileSync('$out','utf8'); console.log(JSON.parse(d).trust)" 2>/dev/null)
+  if [[ "$trust" == "unverified" ]]; then
+    pass "$fixture fixture trust: unverified (not in first-party allowlist)"
+  else
+    fail "$fixture fixture trust: expected unverified, got '$trust'"
+    cat "$out"
+  fi
+done
+
+# ===================================================================
+echo ""
+echo "=== 10. Trust field present in inspect JSON schema ==="
+# ===================================================================
+
+out="$TMP_DIR/trust-schema.out"
+run_inspect "$ROOT/kits/builder" "$out" || true
+if node -e "
+const d = require('fs').readFileSync('$out', 'utf8');
+const r = JSON.parse(d);
+if (!('trust' in r)) throw new Error('missing key: trust');
+const valid = ['first-party', 'verified', 'unverified'];
+if (!valid.includes(r.trust)) throw new Error('trust must be one of: ' + valid.join(', ') + '; got: ' + r.trust);
+" 2>/dev/null; then
+  pass "inspect JSON output includes trust field with valid value"
+else
+  fail "inspect JSON output is missing trust field or has invalid value"
+  cat "$out"
+fi
+
 # ===================================================================
 echo ""
 if [[ "$errors" -eq 0 ]]; then

package/evals/integration/test_local_flow_kit_install.sh

@@ -12,7 +12,7 @@ trap 'rm -rf "$TMP_DIR"' EXIT
 pass() { echo "  ✓ $1"; }
 fail() { echo "  ✗ $1"; errors=$((errors + 1)); }
 
-CLI="$ROOT/scripts/flow-kit.js"
+CLI="$ROOT/scripts/kit.js"
 VALID_SRC="$ROOT/evals/fixtures/flow-kit-repository/valid-local-kit"
 INVALID_SRC="$ROOT/evals/fixtures/flow-kit-repository/invalid-missing-flow"
 DEST="$TMP_DIR/install-dest"
@@ -23,7 +23,7 @@ mkdir -p "$DEST"
 echo "=== Local Flow Kit Install Checks ==="
 
 install_output="$TMP_DIR/install.out"
-if flow_agents_node "$CLI" install-local "$VALID_SRC" --dest "$DEST" >"$install_output" 2>&1; then
+if flow_agents_node "$CLI" install "$VALID_SRC" --dest "$DEST" >"$install_output" 2>&1; then
   pass "valid local kit installs into temp destination"
 else
   fail "valid local kit install failed"
@@ -52,7 +52,7 @@ fi
 
 registry_hash_before_invalid="$(shasum -a 256 "$REGISTRY" | awk '{print $1}')"
 invalid_output="$TMP_DIR/invalid.out"
-if flow_agents_node "$CLI" install-local "$INVALID_SRC" --dest "$DEST" >"$invalid_output" 2>&1; then
+if flow_agents_node "$CLI" install "$INVALID_SRC" --dest "$DEST" >"$invalid_output" 2>&1; then
   fail "invalid local kit install should fail"
   sed -n '1,160p' "$invalid_output"
 elif rg -q 'Flow Kit repository validation failed' "$invalid_output" \
@@ -65,7 +65,7 @@ fi
 
 registry_hash_before_idempotent="$(shasum -a 256 "$REGISTRY" | awk '{print $1}')"
 idempotent_output="$TMP_DIR/idempotent.out"
-if flow_agents_node "$CLI" install-local "$VALID_SRC" --dest "$DEST" >"$idempotent_output" 2>&1 \
+if flow_agents_node "$CLI" install "$VALID_SRC" --dest "$DEST" >"$idempotent_output" 2>&1 \
   && rg -q "already installed" "$idempotent_output" \
   && [[ "$registry_hash_before_idempotent" == "$(shasum -a 256 "$REGISTRY" | awk '{print $1}')" ]]; then
   pass "same-source reinstall is idempotent"
@@ -79,7 +79,7 @@ cp -R "$VALID_SRC" "$CONFLICT_SRC"
 printf '\nconflict copy\n' >> "$CONFLICT_SRC/docs/README.md"
 conflict_output="$TMP_DIR/conflict.out"
 registry_hash_before_conflict="$(shasum -a 256 "$REGISTRY" | awk '{print $1}')"
-if flow_agents_node "$CLI" install-local "$CONFLICT_SRC" --dest "$DEST" >"$conflict_output" 2>&1; then
+if flow_agents_node "$CLI" install "$CONFLICT_SRC" --dest "$DEST" >"$conflict_output" 2>&1; then
   fail "different source with existing kit id should conflict"
   sed -n '1,160p' "$conflict_output"
 elif rg -q 'conflict: kit' "$conflict_output" \
@@ -91,7 +91,7 @@ else
 fi
 
 force_conflict_output="$TMP_DIR/force-conflict.out"
-if flow_agents_node "$CLI" install-local "$CONFLICT_SRC" --dest "$DEST" --force >"$force_conflict_output" 2>&1; then
+if flow_agents_node "$CLI" install "$CONFLICT_SRC" --dest "$DEST" --force >"$force_conflict_output" 2>&1; then
   fail "--force should not replace a different-source duplicate id"
   sed -n '1,160p' "$force_conflict_output"
 elif rg -q 'conflict: kit' "$force_conflict_output" \
@@ -103,7 +103,7 @@ else
 fi
 
 update_output="$TMP_DIR/update.out"
-if flow_agents_node "$CLI" install-local "$CONFLICT_SRC" --dest "$DEST" --update >"$update_output" 2>&1 \
+if flow_agents_node "$CLI" install "$CONFLICT_SRC" --dest "$DEST" --update >"$update_output" 2>&1 \
   && rg -q "updated local kit" "$update_output" \
   && rg -q "$CONFLICT_SRC" "$REGISTRY"; then
   pass "explicit update replaces duplicate id source"

package/evals/integration/test_publish_change_helper.sh

@@ -112,7 +112,7 @@ status=$?
 
 for risk in runtime schema package hook security; do
   case "$risk" in
-    runtime) path="scripts/flow-kit.js" ;;
+    runtime) path="scripts/kit.js" ;;
     schema) path="schemas/workflow-evidence.schema.json" ;;
     package) path="package.json" ;;
     hook) path="scripts/hooks/quality-gate.js" ;;

package/evals/integration/test_pull_work_provider.sh

@@ -52,7 +52,7 @@ status=$?
 [[ "$(json_query "$TMPDIR_EVAL/normalized.json" "items.5.planned_base_sha")" == "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ]] && pass "marker normalizes planned_base_sha" || fail "marker normalizes planned_base_sha"
 [[ "$(json_query "$TMPDIR_EVAL/normalized.json" "items.5.planned_at")" == "2026-06-03T03:23:14Z" ]] && pass "marker normalizes planned_at" || fail "marker normalizes planned_at"
 [[ "$(json_query "$TMPDIR_EVAL/normalized.json" "items.5.planning_artifact_ref")" == ".flow-agents/idea-to-backlog-source-revision-structured-blockers/idea-to-backlog-source-revision-structured-blockers--plan.md" ]] && pass "marker normalizes planning_artifact_ref" || fail "marker normalizes planning_artifact_ref"
-[[ "$(json_query "$TMPDIR_EVAL/normalized.json" "items.5.planning_scope_refs.0")" == "skills/idea-to-backlog/SKILL.md" ]] && pass "marker normalizes planning_scope_refs" || fail "marker normalizes planning_scope_refs"
+[[ "$(json_query "$TMPDIR_EVAL/normalized.json" "items.5.planning_scope_refs.0")" == "kits/builder/skills/idea-to-backlog/SKILL.md" ]] && pass "marker normalizes planning_scope_refs" || fail "marker normalizes planning_scope_refs"
 [[ "$(json_query "$TMPDIR_EVAL/normalized.json" "items.5.source_revisions.1.repo")" == "kontourai/flow" ]] && pass "marker preserves repo-scoped source_revisions" || fail "marker preserves repo-scoped source_revisions"
 [[ "$(json_query "$TMPDIR_EVAL/normalized.json" "items.5.blockers.0.ref.owner")" == "kontourai" ]] && pass "structured blocker preserves provider owner" || fail "structured blocker preserves provider owner"
 [[ "$(json_query "$TMPDIR_EVAL/normalized.json" "items.5.blockers.0.ref.repo")" == "flow" ]] && pass "structured blocker preserves provider repo" || fail "structured blocker preserves provider repo"

package/evals/integration/test_runtime_adapter_activation.sh

@@ -12,7 +12,7 @@ trap 'rm -rf "$TMP_DIR"' EXIT
 pass() { echo "  ✓ $1"; }
 fail() { echo "  ✗ $1"; errors=$((errors + 1)); }
 
-CLI="$ROOT/scripts/flow-kit.js"
+CLI="$ROOT/scripts/kit.js"
 DEST="$TMP_DIR/runtime-dest"
 MIXED_SRC="$ROOT/evals/fixtures/flow-kit-repository/mixed-runtime-kit"
 OUT="$TMP_DIR/activation.json"
@@ -22,7 +22,7 @@ mkdir -p "$DEST"
 
 echo "=== Runtime Adapter Activation Checks ==="
 
-if flow_agents_node "$CLI" install-local "$MIXED_SRC" --dest "$DEST" >"$TMP_DIR/install.out" 2>&1; then
+if flow_agents_node "$CLI" install "$MIXED_SRC" --dest "$DEST" >"$TMP_DIR/install.out" 2>&1; then
   pass "mixed local kit installs into temp destination"
 else
   fail "mixed local kit install failed"
@@ -146,7 +146,7 @@ STRANDS_OUT="$TMP_DIR/strands-activation.json"
 mkdir -p "$STRANDS_DEST"
 
 # Install the mixed kit into strands dest so we can assert skills land there too
-if flow_agents_node "$CLI" install-local "$MIXED_SRC" --dest "$STRANDS_DEST" >"$TMP_DIR/strands-install.out" 2>&1; then
+if flow_agents_node "$CLI" install "$MIXED_SRC" --dest "$STRANDS_DEST" >"$TMP_DIR/strands-install.out" 2>&1; then
   pass "mixed local kit installs into strands temp destination"
 else
   fail "mixed local kit install failed (strands dest)"

package/evals/integration/test_workflow_sidecar_writer.sh

@@ -544,22 +544,22 @@ else
   _fail "existing invalid acceptance ref rejection was not fail-closed: $(cat "$TMPDIR_EVAL/invalid-acceptance-ref.out" "$TMPDIR_EVAL/invalid-acceptance-ref.err")"
 fi
 
-SURFACE_CHECK='{"id":"surface-trust-fixture","kind":"policy","status":"pass","summary":"Surface trust evidence passed.","surface_trust_refs":[{"artifact_kind":"TrustReport","artifact_ref":"trust/report.json","gate_id":"builder.surface.claim","claim_type":"surface.claim","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"fresh","summary":"Issued during this workflow."},"authority":{"producer":"surface-local","summary":"Local Surface trust producer."},"integrity":{"status":"matched","summary":"Artifact digest matched expected subject and gate.","digest":"sha256:abc123"},"status":"pass","summary":"Accepted Surface claim."}]}'
+SURFACE_CHECK='{"id":"surface-trust-fixture","kind":"policy","status":"pass","summary":"Hachure trust.bundle evidence passed.","surface_trust_refs":[{"artifact_kind":"trust.bundle","artifact_ref":"trust/report.json","gate_id":"builder.trust.bundle","claim_type":"builder.trust.bundle","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"fresh","summary":"Issued during this workflow."},"authority":{"producer":"surface-local","summary":"Local Surface trust producer."},"integrity":{"status":"matched","summary":"Artifact digest matched expected subject and gate.","digest":"sha256:abc123"},"status":"pass","summary":"Accepted trust.bundle claim."}]}'
 if flow_agents_node "$WRITER" record-evidence "$ARTIFACT_DIR" \
   --verdict pass \
   --check-json "$SURFACE_CHECK" \
   --timestamp "2026-05-09T00:01:05Z" >"$TMPDIR_EVAL/surface-evidence.out" 2>"$TMPDIR_EVAL/surface-evidence.err" \
   && rg -q '"surface_trust_refs"' "$ARTIFACT_DIR/evidence.json" \
-  && rg -q '"artifact_kind": "TrustReport"' "$ARTIFACT_DIR/evidence.json" \
+  && rg -q '"artifact_kind": "trust.bundle"' "$ARTIFACT_DIR/evidence.json" \
   && ! rg -q 'veritas' "$ARTIFACT_DIR/evidence.json"; then
-  _pass "sidecar writer records provider-neutral Surface trust refs"
+  _pass "sidecar writer records Hachure-aligned trust.bundle refs"
 else
-  _fail "sidecar writer did not record Surface trust refs: $(cat "$TMPDIR_EVAL/surface-evidence.out" "$TMPDIR_EVAL/surface-evidence.err")"
+  _fail "sidecar writer did not record Hachure-aligned trust.bundle refs: $(cat "$TMPDIR_EVAL/surface-evidence.out" "$TMPDIR_EVAL/surface-evidence.err")"
 fi
 
 if flow_agents_node "$WRITER" record-evidence "$ARTIFACT_DIR" \
   --verdict pass \
-  --check-json '{"id":"surface-trust-native-field","kind":"policy","status":"pass","summary":"Should fail.","surface_trust_refs":[{"artifact_kind":"Trust Snapshot","artifact_ref":"trust/snapshot.json","gate_id":"builder.surface.claim","claim_type":"surface.claim","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"fresh","summary":"Fresh."},"authority":{"producer":"surface-local","summary":"Producer exists.","veritas_policy":"native-field"},"integrity":{"status":"matched","summary":"Matched."},"status":"pass"}]}' >"$TMPDIR_EVAL/surface-invalid.out" 2>&1; then
+  --check-json '{"id":"surface-trust-native-field","kind":"policy","status":"pass","summary":"Should fail.","surface_trust_refs":[{"artifact_kind":"trust.bundle","artifact_ref":"trust/snapshot.json","gate_id":"builder.trust.bundle","claim_type":"builder.trust.bundle","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"fresh","summary":"Fresh."},"authority":{"producer":"surface-local","summary":"Producer exists.","veritas_policy":"native-field"},"integrity":{"status":"matched","summary":"Matched."},"status":"pass"}]}' >"$TMPDIR_EVAL/surface-invalid.out" 2>&1; then
   _fail "sidecar writer should reject provider-specific Surface trust fields"
 elif rg -q 'unsupported field' "$TMPDIR_EVAL/surface-invalid.out"; then
   _pass "sidecar writer rejects provider-specific Surface trust fields"
@@ -581,10 +581,10 @@ check_contradictory_surface_ref() {
   fi
 }
 
-check_contradictory_surface_ref "rejected-pass" '{"artifact_kind":"TrustReport","artifact_ref":"trust/report.json","gate_id":"builder.surface.claim","claim_type":"surface.claim","claim_status":"rejected","subject":"builder-kit","freshness":{"status":"fresh","summary":"Fresh."},"authority":{"producer":"surface-local","summary":"Producer exists."},"integrity":{"status":"matched","summary":"Matched."},"status":"pass"}'
-check_contradictory_surface_ref "stale-pass" '{"artifact_kind":"TrustReport","artifact_ref":"trust/report.json","gate_id":"builder.surface.claim","claim_type":"surface.claim","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"stale","summary":"Stale."},"authority":{"producer":"surface-local","summary":"Producer exists."},"integrity":{"status":"matched","summary":"Matched."},"status":"pass"}'
-check_contradictory_surface_ref "missing-authority-pass" '{"artifact_kind":"TrustReport","artifact_ref":"trust/report.json","gate_id":"builder.surface.claim","claim_type":"surface.claim","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"fresh","summary":"Fresh."},"authority":{"producer":"unknown","summary":"Producer missing."},"integrity":{"status":"matched","summary":"Matched."},"status":"pass"}'
-check_contradictory_surface_ref "integrity-mismatch-pass" '{"artifact_kind":"TrustReport","artifact_ref":"trust/report.json","gate_id":"builder.surface.claim","claim_type":"surface.claim","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"fresh","summary":"Fresh."},"authority":{"producer":"surface-local","summary":"Producer exists."},"integrity":{"status":"mismatch","summary":"Mismatch."},"status":"pass"}'
+check_contradictory_surface_ref "rejected-pass" '{"artifact_kind":"trust.bundle","artifact_ref":"trust/report.json","gate_id":"builder.trust.bundle","claim_type":"builder.trust.bundle","claim_status":"rejected","subject":"builder-kit","freshness":{"status":"fresh","summary":"Fresh."},"authority":{"producer":"surface-local","summary":"Producer exists."},"integrity":{"status":"matched","summary":"Matched."},"status":"pass"}'
+check_contradictory_surface_ref "stale-pass" '{"artifact_kind":"trust.bundle","artifact_ref":"trust/report.json","gate_id":"builder.trust.bundle","claim_type":"builder.trust.bundle","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"stale","summary":"Stale."},"authority":{"producer":"surface-local","summary":"Producer exists."},"integrity":{"status":"matched","summary":"Matched."},"status":"pass"}'
+check_contradictory_surface_ref "missing-authority-pass" '{"artifact_kind":"trust.bundle","artifact_ref":"trust/report.json","gate_id":"builder.trust.bundle","claim_type":"builder.trust.bundle","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"fresh","summary":"Fresh."},"authority":{"producer":"unknown","summary":"Producer missing."},"integrity":{"status":"matched","summary":"Matched."},"status":"pass"}'
+check_contradictory_surface_ref "integrity-mismatch-pass" '{"artifact_kind":"trust.bundle","artifact_ref":"trust/report.json","gate_id":"builder.trust.bundle","claim_type":"builder.trust.bundle","claim_status":"accepted","subject":"builder-kit","freshness":{"status":"fresh","summary":"Fresh."},"authority":{"producer":"surface-local","summary":"Producer exists."},"integrity":{"status":"mismatch","summary":"Mismatch."},"status":"pass"}'
 
 SURFACE_FIXTURE_DIR="$ROOT/evals/fixtures/surface-trust"
 check_surface_fixture() {

package/evals/lib/node.sh

@@ -45,10 +45,10 @@ flow_agents_node() {
       node "$FLOW_AGENTS_EVAL_ROOT/build/src/cli/validate-source-tree.js" "$@"
       return
       ;;
-    */scripts/flow-kit.js|scripts/flow-kit.js)
+    */scripts/kit.js|scripts/kit.js)
       shift
       flow_agents_build_ts || return
-      node "$FLOW_AGENTS_EVAL_ROOT/build/src/cli/flow-kit.js" "$@"
+      node "$FLOW_AGENTS_EVAL_ROOT/build/src/cli/kit.js" "$@"
       return
       ;;
     */scripts/effective-backlog-settings.js|scripts/effective-backlog-settings.js)

package/evals/static/test_package.sh

@@ -211,8 +211,8 @@ for (const gateId of ["verify-gate", "merge-ready-gate"]) {
 const expectations = Object.values(flow.gates || {}).flatMap((gate) => gate.expects || []);
 if (!expectations.length) throw new Error("Builder build flow should declare gate expectations");
 for (const expectation of expectations) {
-  if (expectation.kind !== "surface.claim") throw new Error(`${expectation.id || "<unknown>"} should remain a surface.claim expectation`);
-  if (!expectation.claim?.type || !expectation.claim?.accepted_statuses) throw new Error(`${expectation.id || "<unknown>"} should declare claim type and accepted statuses`);
+  if (expectation.kind !== "trust.bundle") throw new Error(`${expectation.id || "<unknown>"} should remain a trust.bundle expectation`);
+  if (!expectation.bundle_claim?.claimType || !expectation.bundle_claim?.accepted_statuses) throw new Error(`${expectation.id || "<unknown>"} should declare bundle_claim claimType and accepted statuses`);
 }
 const flowText = JSON.stringify(flow).toLowerCase();
 for (const term of ["veritas", "trust_provider", "trust-provider", "provider_name", "provider_ref", "veritas_policy", "veritas_readiness"]) {
@@ -221,7 +221,7 @@ for (const term of ["veritas", "trust_provider", "trust-provider", "provider_nam
 console.log("ok");
 NODE
   then
-    _pass "installed Builder Kit build flow keeps provider-neutral surface.claim gates"
+    _pass "installed Builder Kit build flow keeps provider-neutral trust.bundle gates"
   else
     _fail "installed Builder Kit build flow route-back or provider-neutral gate policy missing or wrong"
   fi

package/evals/static/test_workflow_skills.sh

@@ -52,19 +52,19 @@ require_status() {
 
 echo "=== Workflow Skill Contract Checks ==="
 
-IDEA="$ROOT/skills/idea-to-backlog/SKILL.md"
-BUILDER_SHAPE="$ROOT/skills/builder-shape/SKILL.md"
-PULL="$ROOT/skills/pull-work/SKILL.md"
-DESIGN_PROBE="$ROOT/skills/design-probe/SKILL.md"
-PICKUP_PROBE="$ROOT/skills/pickup-probe/SKILL.md"
-EVIDENCE="$ROOT/skills/evidence-gate/SKILL.md"
-RELEASE="$ROOT/skills/release-readiness/SKILL.md"
-LEARNING="$ROOT/skills/learning-review/SKILL.md"
-DELIVER="$ROOT/skills/deliver/SKILL.md"
-PLAN_WORK="$ROOT/skills/plan-work/SKILL.md"
-EXECUTE_PLAN="$ROOT/skills/execute-plan/SKILL.md"
-REVIEW_WORK="$ROOT/skills/review-work/SKILL.md"
-VERIFY_WORK="$ROOT/skills/verify-work/SKILL.md"
+IDEA="$ROOT/kits/builder/skills/idea-to-backlog/SKILL.md"
+BUILDER_SHAPE="$ROOT/kits/builder/skills/builder-shape/SKILL.md"
+PULL="$ROOT/kits/builder/skills/pull-work/SKILL.md"
+DESIGN_PROBE="$ROOT/kits/builder/skills/design-probe/SKILL.md"
+PICKUP_PROBE="$ROOT/kits/builder/skills/pickup-probe/SKILL.md"
+EVIDENCE="$ROOT/kits/builder/skills/evidence-gate/SKILL.md"
+RELEASE="$ROOT/kits/builder/skills/release-readiness/SKILL.md"
+LEARNING="$ROOT/kits/builder/skills/learning-review/SKILL.md"
+DELIVER="$ROOT/kits/builder/skills/deliver/SKILL.md"
+PLAN_WORK="$ROOT/kits/builder/skills/plan-work/SKILL.md"
+EXECUTE_PLAN="$ROOT/kits/builder/skills/execute-plan/SKILL.md"
+REVIEW_WORK="$ROOT/kits/builder/skills/review-work/SKILL.md"
+VERIFY_WORK="$ROOT/kits/builder/skills/verify-work/SKILL.md"
 MAP="$ROOT/docs/skills-map.md"
 ROOT_CONTEXT="$ROOT/CONTEXT.md"
 CONTEXT_MAP="$ROOT/docs/context-map.md"
@@ -146,6 +146,7 @@ while IFS= read -r guidance_surface; do
 done < <(
   {
     find "$ROOT/skills" -type f -name '*.md'
+    find "$ROOT/kits" -path "*/skills/*/SKILL.md" -type f
     find "$ROOT/context/contracts" -maxdepth 1 -type f -name '*.md'
     find "$ROOT/agents" -maxdepth 1 -type f -name '*.json'
     printf '%s\n' "$ROOT/packaging/manifest.json"
@@ -553,7 +554,7 @@ echo ""
 echo "--- builder-shape ---"
 require_text "$BUILDER_SHAPE" '^name: "builder-shape"$' "frontmatter name"
 require_text "$BUILDER_SHAPE" 'Builder Kit `shape` flow' "defines Builder Kit shape product surface"
-require_text "$BUILDER_SHAPE" 'skills/idea-to-backlog/SKILL.md' "delegates to idea-to-backlog"
+require_text "$BUILDER_SHAPE" 'kits/builder/skills/idea-to-backlog/SKILL.md' "delegates to idea-to-backlog"
 require_text "$BUILDER_SHAPE" 'kits/builder/flows/shape.flow.json' "links Builder Kit Flow Definition"
 require_text "$BUILDER_SHAPE" 'raw idea.*current conversation context|current conversation context.*raw idea' "accepts raw idea or conversation context"
 require_text "$BUILDER_SHAPE" 'Probe/alignment' "uses Probe alignment language"
@@ -1074,17 +1075,17 @@ const flow = JSON.parse(fs.readFileSync(process.argv[2], "utf8"));
 const expectations = Object.values(flow.gates || {}).flatMap((gate) => gate.expects || []);
 if (!expectations.length) throw new Error("no Builder Kit gate expectations found");
 for (const expectation of expectations) {
-  if (expectation.kind !== "surface.claim") throw new Error(`${expectation.id || "<unknown>"} is not a surface.claim expectation`);
-  if (!expectation.claim?.type || !expectation.claim?.accepted_statuses) throw new Error(`${expectation.id || "<unknown>"} is missing claim type or accepted statuses`);
+  if (expectation.kind !== "trust.bundle") throw new Error(`${expectation.id || "<unknown>"} is not a trust.bundle expectation`);
+  if (!expectation.bundle_claim?.claimType || !expectation.bundle_claim?.accepted_statuses) throw new Error(`${expectation.id || "<unknown>"} is missing bundle_claim claimType or accepted statuses`);
 }
 const flowText = JSON.stringify(flow).toLowerCase();
 for (const term of ["veritas", "trust_provider", "trust-provider", "provider_name", "provider_ref", "veritas_policy", "veritas_readiness"]) {
   if (flowText.includes(term)) throw new Error(`provider-specific trust field leaked into Builder Kit build flow: ${term}`);
 }
 NODE
-  pass "Builder build flow keeps provider-neutral surface.claim expectations"
+  pass "Builder build flow keeps provider-neutral trust.bundle expectations"
 else
-  fail "Builder build flow keeps provider-neutral surface.claim expectations"
+  fail "Builder build flow keeps provider-neutral trust.bundle expectations"
 fi
 require_text "$MAP" 'pull-work' "map includes pull-work"
 require_text "$MAP" 'pickup Probe before planning' "map documents pickup Probe before planning"
@@ -1102,7 +1103,6 @@ require_text "$PACKS_MANIFEST" '"name": "core"' "pack manifest defines core pack
 require_text "$PACKS_MANIFEST" '"default": true' "pack manifest defines default pack"
 require_text "$PACKS_MANIFEST" '"name": "development"' "pack manifest defines development pack"
 require_text "$PACKS_MANIFEST" '"eval-rebuild"' "pack manifest includes eval-rebuild"
-require_text "$PACKS_MANIFEST" '"explore"' "pack manifest includes explore"
 require_text "$ROOT/scripts/build-universal-bundles.js" 'FLOW_AGENTS_PACKS' "bundle installer supports pack filtering"
 require_text "$ROOT/evals/integration/test_bundle_install.sh" 'core-pack install keeps core agents' "bundle install test covers pack filtering"
 require_text "$CONTEXT_MAP" 'Context Loading Rules' "context map includes loading rules"

package/integrations/strands/flow_agents_strands/steering.py

@@ -211,7 +211,7 @@ class SteeringContext:
         """
         Surface activated kit flows from the strands-local runtime path.
 
-        Reads .flow-agents/runtime/strands/flows/ (written by `flow-kit activate
+        Reads .flow-agents/runtime/strands/flows/ (written by `flow-agents kit activate
         --adapter strands-local`) and emits a brief hint listing active kit flows
         by id and description so the agent is aware of available workflow guidance.
         """

package/integrations/strands-ts/src/hooks.ts

@@ -189,7 +189,7 @@ export class FlowAgentsHooks {
    *
    * Includes activated kit flows discovered from the strands-local runtime
    * path (.flow-agents/runtime/strands/flows/) written by
-   * `flow-kit activate --adapter strands-local`.
+   * `flow-agents kit activate --adapter strands-local`.
    *
    * Callers should prepend this to the Agent's system prompt:
    *