@awebai/oats 0.27.0 → 0.27.2

package/capabilities/oats-aweb/lib/binding-wire.mjs

@@ -83,10 +83,11 @@ export function parseBindingJson(bytes,limits=BINDING_WIRE_LIMITS) {
 function settings(value,{phase}={}) {
   if(!obj(value)) wireError('invalid-binding');
   if(phase!=='check' && Object.hasOwn(value,'identity')) wireError('provider-not-qualified');
-  keys(value,phase==='check'?['delivery','team','root','roots','identity','residents']:['delivery','team','root','roots'],[]);
+  keys(value,phase==='check'?['delivery','team','root','roots','identity','residents','join']:['delivery','team','root','roots','join'],[]);
   if(value.delivery!==undefined && !['channel','session'].includes(value.delivery)) wireError('needs-configuration');
   if(value.team!==undefined && (typeof value.team!=='string' || !value.team.trim())) wireError('needs-configuration');
   if(value.root!==undefined && (typeof value.root!=='string' || !value.root.trim())) wireError('needs-configuration');
+  if(value.join!==undefined && typeof value.join!=='string') wireError('needs-configuration');
   if(value.roots!==undefined && !obj(value.roots)) wireError('needs-configuration');
   if(obj(value.roots)) for(const [team,root] of Object.entries(value.roots)) if(!team || typeof root!=='string' || !root.trim()) wireError('needs-configuration');
   if(value.identity!==undefined && !obj(value.identity)) wireError('needs-configuration');
@@ -164,6 +165,9 @@ function workspaceReadinessContext(value) {
 }
 function yamlScalar(text,key){const m=String(text).match(new RegExp(`^${key}:\\s*["']?([^"'\\n#]+)["']?\\s*$`,'m'));return m?m[1].trim():undefined;}
 export const CUSTODY_ATTACH_MIN = '1.36.3';
+export const WAKE_STREAM_MIN = '1.36.5';
+const CLASSIC_REFUSAL = 'oats.aweb 1.14 needs OATS 0.26.0 or newer (workspace model); on an older kernel pin oats.aweb v1.13.x';
+function classicEnv(env=process.env) {return !!env.OATS_TEAM_SCOPE && !(env.OATS_WORKSPACE_KEY || env.OATS_WORKSPACE_NAME || env.OATS_TEAM_LABEL);}
 export function grantYamlCustodySocket(text) {
   const lines=String(text??'').split(/\r?\n/);let inCustody=false,baseIndent=0;
   for(const line of lines) {
@@ -189,27 +193,35 @@ function grantAttachmentProblem(home) {
   const id=yamlScalar(text,'grant_id')||'<unknown>';
   return {code:'custody',message:`grant ${id} is not attached to custody; retire and respawn on aw >= ${CUSTODY_ATTACH_MIN}`};
 }
-function activeTeamAt(root){try{return yamlScalar(readFileSync(join(resolve(root),'.aw','teams.yaml'),'utf8'),'active_team')||yamlScalar(readFileSync(join(resolve(root),'.aw','teams.yaml'),'utf8'),'active');}catch{return undefined;}}
+function activeTeamAt(root){try{const text=readFileSync(join(resolve(root),'.aw','teams.yaml'),'utf8');return yamlScalar(text,'active_team')||yamlScalar(text,'active');}catch{return undefined;}}
+function residentCustodyRoot(settings){const identity=obj(settings.identity)?settings.identity:{},residents=obj(settings.residents)?settings.residents:{};const name=typeof identity.resident==='string'?identity.resident:'';const root=name&&typeof residents[name]==='string'?residents[name]:undefined;return identity.mode==='global'&&root&&isAbsolute(root)?root:undefined;}
 function teamFromSettings(settings,candidate,{env=process.env}={}) {
-  const configured=typeof settings.team==='string' && settings.team.trim()?settings.team.trim():(env.OATS_TEAM_ID || env.OATS_TEAM_NAME || undefined);
-  if(configured || env.OATS_TEAM_LABEL) return configured;
+  const configured=typeof settings.team==='string' && settings.team.trim()?settings.team.trim():undefined;
+  if(configured) return configured;
+  const custody=residentCustodyRoot(settings);if(custody)return activeTeamAt(custody);
   return candidate?.root && isAbsolute(candidate.root) ? activeTeamAt(candidate.root) : undefined;
 }
-function classicEnv(env=process.env) {return !!env.OATS_TEAM_SCOPE && !(env.OATS_WORKSPACE_KEY || env.OATS_WORKSPACE_NAME || env.OATS_TEAM_LABEL);}
 function rootCandidate(settings,team,{deployment,env=process.env}={}) {
   const roots=obj(settings.roots)?settings.roots:{};
   if(team && typeof roots[team]==='string' && roots[team].trim()) return {root:roots[team].trim(),key:`settings.oats.aweb.roots[${JSON.stringify(team)}]`,declared:true};
   if(typeof settings.root==='string' && settings.root.trim()) return {root:settings.root.trim(),key:'settings.oats.aweb.root',declared:true};
-  const candidates=classicEnv(env)?[env.OATS_TEAM_SCOPE,env.OATS_WORKSPACE].filter(Boolean):[env.OATS_WORKSPACE || deployment || env.OATS_TEAM_SCOPE || process.cwd()];
+  const candidates=[env.OATS_WORKSPACE || deployment || process.cwd()];
   for(const root of candidates) if(isAbsolute(root) && existsSync(join(resolve(root),'.aw'))) return {root,key:'settings.oats.aweb.root',declared:false};
   return {root:candidates[0] || process.cwd(),key:'settings.oats.aweb.root',declared:false};
 }
+function parseOatsTeams(env=process.env){try{const rows=JSON.parse(env.OATS_TEAMS||'[]');return Array.isArray(rows)?rows.filter(r=>r&&typeof r==='object').map(r=>({label:String(r.label||''),team:typeof r.team==='string'?r.team:null,mapped:r.mapped===true,payload:obj(r.payload)?r.payload:{}})):[];}catch{return [];}}
+function primaryTeamLabel(env=process.env){return env.OATS_TEAM_LABEL || String(env.OATS_TEAM_LABELS||'').split(',').map(s=>s.trim()).filter(Boolean)[0] || null;}
+function unmappedPrimary(env=process.env){const primary=primaryTeamLabel(env);return primary?parseOatsTeams(env).find(t=>t.label===primary&&!t.mapped):undefined;}
+function joinedTeams(home){if(!home)return[];try{const doc=JSON.parse(readFileSync(join(home,'.oats-aweb','teams.json'),'utf8'));return Array.isArray(doc.joinedTeams)?doc.joinedTeams.filter(j=>j&&typeof j==='object'&&j.label&&j.team&&j.identityHome):[];}catch{return[];}}
+function teamsReadiness({home,team,env=process.env}){const teams=parseOatsTeams(env),joined=joinedTeams(home),joinedLabels=new Set(joined.map(j=>j.label));return{personal:{team:team||null},primary:primaryTeamLabel(env),eligible:teams.filter(t=>t.mapped&&t.team).map(t=>({label:t.label,team:t.team,joined:joinedLabels.has(t.label)})),joined:joined.map(j=>({label:j.label,team:j.team,identityHome:j.identityHome,receive:j.receive||'poll',since:j.since})),unmapped:teams.filter(t=>!t.mapped).map(t=>t.label),at:new Date().toISOString()};}
 function readinessDetails(settings,{deployment,env=process.env}={}) {
-  const initialTeam=typeof settings.team==='string' && settings.team.trim()?settings.team.trim():(env.OATS_TEAM_ID || env.OATS_TEAM_NAME || undefined);
-  const candidate=rootCandidate(settings,initialTeam,{deployment,env}),team=teamFromSettings(settings,candidate,{env}),problems=[];
+  if(classicEnv(env)) return {team:undefined,candidate:null,warnings:[],result:{status:'needs-configuration',problems:[{code:'needs-configuration',message:CLASSIC_REFUSAL}]}};
+  const initialTeam=typeof settings.team==='string' && settings.team.trim()?settings.team.trim():undefined;
+  const candidate=rootCandidate(settings,initialTeam,{deployment,env}),team=teamFromSettings(settings,candidate,{env}),problems=[],warnings=[];
   if(!candidate.root || !isAbsolute(candidate.root) || !existsSync(join(resolve(candidate.root),'.aw'))) problems.push({code:'needs-configuration',message:`no messaging root at ${candidate.root?resolve(candidate.root):process.cwd()}: run oats aweb setup there or set ${candidate.key}`});
-  if(!team) problems.push({code:'needs-configuration',message:'no team: set messaging.byTeam.<label>.team in the workspace file or settings.oats.aweb.team'});
-  return {team,candidate,result:checkProblems(problems) || {status:'ready',problems:[]}};
+  const unmapped=unmappedPrimary(env);if(unmapped&&team)warnings.push({code:'team-unmapped',message:`workspace label ${unmapped.label} is not mapped; using personal team ${team}`});
+  if(!team) problems.push({code:'needs-configuration',message:'no team: set settings.oats.aweb.team or keep an active team at the aweb root'});
+  return {team,candidate,warnings,result:checkProblems(problems) || {status:'ready',problems:[]}};
 }
 function readinessFromSettings(settings,options) {return readinessDetails(settings,options).result;}
 function runAw(argv,cwd,{unsetEnv=[],timeout=60000}={}) {
@@ -217,10 +229,25 @@ function runAw(argv,cwd,{unsetEnv=[],timeout=60000}={}) {
   try {return execFileSync(argv[0],argv.slice(1),{cwd,env,encoding:'utf8',stdio:['ignore','pipe','pipe'],timeout}).trim();}
   catch(e) {throw new Error(`${argv.slice(0,3).join(' ')} failed${e.status===undefined?'':` (exit ${e.status})`}`);}
 }
+function semverLt(a,b) {const A=String(a||'0.0.0').split('.').map(n=>Number(n)||0),B=String(b).split('.').map(n=>Number(n)||0);for(let i=0;i<3;i++){if((A[i]||0)!==(B[i]||0)) return (A[i]||0)<(B[i]||0);}return false;}
+function wakeReadiness(home,{reliedOn=false}={}) {
+  if(!home || !reliedOn) return {problems:[],warnings:[]};
+  try {
+    const doc=JSON.parse(runAw(['aw','wake','status','--json'],home,{timeout:10000}));
+    const state=doc.daemon_version_state || (doc.daemon_running===false?'not_running':doc.daemon_version?'reported':'unknown');
+    if(state==='reported') {
+      const running=String(doc.daemon_version||'unknown');
+      if(semverLt(running,WAKE_STREAM_MIN)) return {problems:[{code:'wake-daemon-outdated',message:`host wake daemon is running ${running}; required ${WAKE_STREAM_MIN}; upgrade aw, then restart the host wake daemon`}],warnings:[]};
+      return {problems:[],warnings:[]};
+    }
+    if(state==='not_running') return {problems:[{code:'wake-daemon-not-running',message:'host wake daemon is not running; session delivery relies on it'}],warnings:[]};
+    return {problems:[],warnings:[{code:'wake-daemon-version-unknown',message:`host wake daemon version is unknown; compatibility unproven; required ${WAKE_STREAM_MIN}; upgrade aw, then restart the host wake daemon`}]};
+  } catch {return {problems:[],warnings:[{code:'wake-daemon-version-unknown',message:`host wake daemon version is unknown; compatibility unproven; required ${WAKE_STREAM_MIN}; upgrade aw, then restart the host wake daemon`}]};}
+}
 function workspaceReadinessPhase(req) {
   const ctx=workspaceReadinessContext(req.input.context);
   if(!obj(req.input.action) || req.input.action.kind!=='readiness') wireError('invalid-binding');
-  const details=readinessDetails(req.settings,{deployment:ctx.deployment}),problems=[...details.result.problems],warnings=[];
+  const details=readinessDetails(req.settings,{deployment:ctx.deployment}),problems=[...details.result.problems],warnings=[...details.warnings];
   const identity=obj(req.settings.identity)?req.settings.identity:{},mode=identity.mode===undefined || identity.mode===null || identity.mode===''?'local':String(identity.mode);
   if(mode==='global') {
     const grantProblem=grantAttachmentProblem(ctx.home);if(grantProblem) problems.push(grantProblem);
@@ -237,6 +264,10 @@ function workspaceReadinessPhase(req) {
       catch(e) {problems.push({code:'custody',message:e.message});}
     }
   }
+  const teams=process.env.OATS_TEAMS?teamsReadiness({home:ctx.home,team:details.team,env:process.env}):undefined;
+  for(const joined of teams?.joined||[]) if(joined.receive==='poll') warnings.push({code:'joined-team-poll-only',message:`joined team ${joined.label} receives by polling in oats.aweb 1.14; check aw --identity-home ${joined.identityHome} mail inbox/chat pending`});
+  const wake=String(req.settings.delivery||'channel')==='session'?wakeReadiness(ctx.home,{reliedOn:true}):{problems:[],warnings:[]};
+  problems.push(...wake.problems);warnings.push(...wake.warnings);
   const result=checkProblems(problems) || {status:'ready',problems:[]};
   return {...result,warnings};
 }

package/capabilities/oats-aweb/oats.json

@@ -1,9 +1,9 @@
 {
   "capability": "oats.aweb",
   "command": "aweb",
-  "version": "1.13.1",
+  "version": "1.14.2",
   "compatibility": {
-    "oats": ">=0.25.6"
+    "oats": ">=0.26.0"
   },
   "layer": "messaging",
   "description": "Messaging layer via aweb: per-instance team identities + native aw mail/chat skills + cross-machine team roster.",
@@ -71,7 +71,10 @@
     "setup": "bin/oats-aweb.mjs setup",
     "binding-normalize": "bin/oats-aweb-binding.mjs normalize",
     "binding-bind": "bin/oats-aweb-binding.mjs bind",
-    "binding-check": "bin/oats-aweb-binding.mjs check"
+    "binding-check": "bin/oats-aweb-binding.mjs check",
+    "teams": "bin/oats-aweb.mjs teams",
+    "join": "bin/oats-aweb.mjs join",
+    "leave": "bin/oats-aweb.mjs leave"
   },
   "binding": {
     "version": 1,
@@ -138,7 +141,7 @@
       "description": "channel: the native aweb channel packages wake the instance (default). session: delivery is external (AWEB_DELIVERY=session), no channel flag; the host wake broker registers the instance once it exists."
     },
     "team": {
-      "description": "Target aweb team id for identity lifecycle. In workspace v2 spawns this payload value wins over OATS_TEAM_ID/OATS_TEAM_NAME; if both are set and differ the hook warns and uses this setting."
+      "description": "Target aweb team id for the primary personal identity lifecycle. In workspace v2 spawns this payload value wins over OATS_TEAM_ID; if both are set and differ the hook warns and uses this setting."
     },
     "root": {
       "hostOnly": true,
@@ -157,9 +160,48 @@
     "residents": {
       "hostOnly": true,
       "description": "Host-owned map for global mode: resident name to absolute custody directory whose .aw holds the resident root keys and team certificate. Put this only in oats-local.yaml settings.oats.aweb.residents; committed workspace or soul files must never carry custody paths."
+    },
+    "join": {
+      "description": "comma-separated eligible team labels to join at spawn; values are workspace-defined labels and the default is absent"
     }
   },
   "environmentNamespaces": [
     "AWEB_"
-  ]
+  ],
+  "operations": {
+    "teams": {
+      "kind": "action",
+      "command": "teams",
+      "context": "home",
+      "description": "Read-only structured JSON summary of eligible and joined aweb teams for this home."
+    },
+    "join": {
+      "kind": "action",
+      "command": "join",
+      "context": "home",
+      "description": "Join comma-separated eligible aweb team labels for this home.",
+      "args": [
+        {
+          "name": "labels",
+          "flag": "--labels",
+          "required": true,
+          "description": "Comma-separated eligible team labels to join."
+        }
+      ]
+    },
+    "leave": {
+      "kind": "action",
+      "command": "leave",
+      "context": "home",
+      "description": "Leave comma-separated joined aweb team labels for this home.",
+      "args": [
+        {
+          "name": "labels",
+          "flag": "--labels",
+          "required": true,
+          "description": "Comma-separated joined team labels to leave."
+        }
+      ]
+    }
+  }
 }

package/capabilities/oats-aweb/skills/aweb-team-membership/SKILL.md

@@ -1,328 +1,106 @@
 ---
 name: aweb-team-membership
-description: This skill should be used when joining or being added to an aweb team, picking the correct invite/add-member path for the team's authority model (hosted vs BYOT), accepting invites, fetching team certificates, switching the active team across multiple memberships, distinguishing hosted from Bring Your Own Team (BYOT) authority, running the fresh BYOT setup into aweb cloud, or diagnosing team-certificate and active-team failures. Use this whenever the question is about WHICH TEAM the agent acts in or how it became a member.
-allowed-tools: "Bash(aw *)"
+description: This skill should be used when reasoning about which aweb/OATS teams an agent belongs to, checking team certificates and active-team diagnostics, or using the OATS provider's team operations (`oats aweb teams|join|leave`). Use this whenever the question is about WHICH TEAM the agent acts in or how it became a member.
+allowed-tools: "Bash(aw workspace status), Bash(aw team list), Bash(aw id cert show), Bash(oats aweb *)"
 ---
 
-# aweb Team Membership
+# aweb Team Membership for OATS agents
 
-Use this skill when the question is about teams — joining, leaving, switching between, or troubleshooting team certificates. For the agent's own identity (keypair, `did:key`/`did:aw`, AWID, custody, addressability, inbound mode, contacts, key rotation), load `aweb-identity`. For day-to-day work coordination, load `aweb-coordination`. For mail/chat policy, load `aweb-messaging`. For creating a new team from a template, load `aweb-bootstrap`.
+Use this skill when the question is about teams: current membership, eligible
+workspace teams, joined wider teams, team certificates, or why a message/command
+is landing in the wrong team. For identity keys, `did:key`/`did:aw`, custody,
+addressability, inbound mode, contacts, or key rotation, load `aweb-identity`.
+For mail/chat policy, load `aweb-messaging`.
 
-## Foundations
+## OATS owns agent team changes
 
-This skill builds on the identity vocabulary in `aweb-identity` (keypair, `did:key`, `did:aw`, AWID, custodial vs self-custodial). Read that section first if any of those terms are unfamiliar. Team-specific additions:
+For an OATS-managed instance, do **not** manually run native `aw team` mutation
+commands to join, switch, invite, or leave teams. The `oats.aweb` provider owns
+those lifecycle effects so it can keep per-team identity homes, provider state,
+retire cleanup, readiness, and Desktop operations consistent.
 
-- **Team controller** — a keypair separate from member identities. Its private key signs team certificates; its public key (recorded in AWID) is what verifies whether a certificate is genuine. Team controllers authorize membership; they do not decrypt member conversations and must not substitute a member's E2E encryption key.
-- **Team certificate** — a signed statement that a specific `did:key` is a member of a specific team, with an alias and metadata. Public; replicated in AWID. Stored locally in `.aw/team-certs/*.pem`. A certificate proves team membership; it is not a message-decryption key.
-- **Team id** — canonical form is `<name>:<namespace>` (e.g. `personal:acme.com`, `aweb:juan.aweb.ai`). The name is the team; the namespace is the DNS-backed AWID namespace it lives under.
-- **Hosted vs BYOT team authority** — *hosted* means aweb holds the team controller signing key (for `*.aweb.ai` namespaces). *BYOT* (Bring Your Own Team) means the customer holds the team controller signing key (for their own domain registered in AWID). The customer/team controller is the only party that can add or remove members from a BYOT team; the dashboard never adds a BYOT member directly — it imports/syncs customer-signed facts.
-
-## Team-related files in `.aw/`
-
-For identity files (`signing.key`, `workspace.yaml` server URL), see `aweb-identity`. Team-specific files:
-
-- `teams.yaml` — local index of teams this identity is a member of. Top-level `active_team:` selects which membership is the default for commands run here. `aw team list` reads this; `aw team switch <team-id>` updates it.
-- `team-certs/*.pem` — public team certificates this identity has been issued (one `.pem` per team membership). `teams.yaml` and `workspace.yaml` reference these by `cert_path`.
-
-## Custody × Authority matrix
-
-Identity custody (where the private key lives) and team authority (who holds the team controller key) are independent axes. Use the matrix to pick the right joining path:
-
-| Team authority | Identity custody | Meaning |
-| --- | --- | --- |
-| Hosted | Custodial | aweb manages team authority AND holds hosted identity signing key material (browser/MCP). Messaging in this mode is server-readable hosted messaging, not E2E. |
-| Hosted | Self-custodial | aweb manages team authority; the terminal agent holds its own `.aw/signing.key`. |
-| BYOT | Self-custodial | the customer controls team authority; the agent holds its own key. |
-| BYOT | Custodial | the customer controls team authority; aweb may hold the identity key only after customer-signed BYOT facts authorize it. |
-
-A custodial identity has **no BYOT team authority** until the customer-signed team certificate and address facts match. Do not infer team authority from identity custody.
-
-For E2E messaging, custody and team membership are still not enough by themselves: the recipient's encryption public key must be identity-authorized as described in `docs/e2e-messaging-contract.md`. Team/namespace authority may distribute that assertion, but it must not replace the member's key. If an encryption-key check fails, do not suggest a team-controller workaround or plaintext fallback; stop and route the user to the approved identity/key setup or recovery flow.
-
-## Readiness checks (membership level)
-
-Start with:
-
-```bash
-aw workspace status
-aw team list
-aw id cert show
-```
-
-Interpret failures by what's missing (for self-custodial CLI workspaces; custodial browser/MCP identities live entirely in the hosted account):
-
-- **`.aw/teams.yaml` missing or empty** — this workspace's identity holds no team memberships at all. Join one (see paths below) before attempting team coordination.
-- **No `.aw/team-certs/<team>.pem` for `teams.yaml`'s active team** — identity exists but holds no cert for the active team. Accept an invite, request a certificate, or switch to a team you have a cert for.
-- **Active team mismatch** — `teams.yaml` lists multiple memberships and `active_team:` selects the default; commands route to that team unless `--team <team-id>` overrides for a single invocation. If commands appear to land in the wrong team, fix `active_team:` (run `aw team switch <team-id>`).
-- **Workspace not bound to a server** — `workspace.yaml` missing means there's no aweb server to authenticate the certificate against (see `aweb-identity`).
-
-## Joining a team — match the path to team authority
-
-The right joining path depends entirely on **who holds the team controller signing key**. Pick by authority, not by the word "invite" alone.
-
-### Hosted teams (aweb holds the team controller key)
-
-Three distinct paths exist; they are NOT interchangeable.
-
-**Path 1 — Fresh identity at init time.** A new agent without any prior identity arrives at a hosted team via OAuth (browser/MCP) or team API-key (CLI):
-
-```bash
-AWEB_API_KEY=<team-api-key> aw init
-```
-
-The hosted service provisions the identity and a team certificate together. Browser/MCP harnesses do this through OAuth without a CLI. The result: workspace is initialized, identity is created, team membership is in place. Verify with `aw workspace status` and `aw team list`.
-
-**Path 2 — Existing global identity → "Add existing identity" in the dashboard.** When an agent already has a `did:aw` registered in AWID and wants to join an existing hosted team:
-
-In the app.aweb.ai dashboard, an owner/admin clicks "Add existing identity" on the team, supplies the global identity's address or `did:aw`, and the backend mints a team certificate with the cloud-held team controller key, registers it in AWID, and prints commands like:
-
-```bash
-aw id team fetch-cert --namespace <namespace> --team <team> --cert-id <cert-id>
-aw team switch <team>:<namespace>
-aw init   # if the joining directory still needs server binding
-```
-
-No token round-trip. Direct controller-mint. Available only for hosted teams because BYOT controller keys aren't held by aweb.
-
-**Path 3 — CLI invite-token, for hosted self-custodial local or global identities.** Hosted CLI invite tokens are redeemed through the cloud, but the accepting directory keeps its own signing key. Use the default form when the owner wants to invite a new local-workspace identity by token:
-
-```bash
-# Owner side (in a workspace with the necessary authority):
-aw team invite                 # local-workspace member token
-
-# share the printed <token>
-
-# Joiner side (in a clean target directory):
-aw team join <token> --name <name>
-aw init                        # finish wiring the new workspace if instructed
-```
-
-`accept-invite` refuses to overwrite an existing `.aw/` identity and generates a fresh local self-custodial identity in the target directory before requesting the certificate. For a hosted global identity, accept the hosted token with `--address <domain>/<name>`:
-
-```bash
-aw team join <token> --address <domain>/<name>
-aw init                        # finish wiring the new workspace if instructed
-```
-
-In the hosted `--address` case, the CLI creates a fresh self-custodial global identity for the address, registers it through the hosted service, and installs the hosted team certificate. The hosted service signs the team certificate; it does not receive the accepting directory's private signing key. If the user already has a global identity and only needs a certificate for an existing hosted team, Path 2 (dashboard Add existing identity + `fetch-cert`) remains valid.
-
-This is **not** the cross-machine BYOT path. Do not present it as the normal way to join a BYOT team from another machine.
-
-**Do not run `aw id team add-member` for a hosted team** — `add-member` signs a certificate with the team controller key, which you do not hold for hosted teams. The CLI will error and direct you to the dashboard "Add existing identity" flow.
-
-### BYOT teams (customer holds the team controller key)
-
-The dashboard cannot add BYOT members directly. The customer's team controller must sign. Three cases:
-
-**Case 1 — Self-custodial identity, cross-machine join.** The joining machine doesn't hold the team controller key:
-
-```bash
-# Joining identity machine
-aw id team request --team <team>:<namespace> --name <name>
-
-# Controller machine — runs the exact command the request printed:
-aw id team add-member ...
-
-# Back on the joining identity machine
-aw id team fetch-cert --namespace <namespace> --team <team> --cert-id <id>
-aw team switch <team>:<namespace>
-aw init   # if needed
-```
-
-The team controller private key never leaves the controller machine.
-
-**Case 2 — Custodial browser identity into a BYOT team.** Start from the dashboard's "Create custodial request" action. The dashboard prints the controller-side command block (member identity creation, namespace address assignment, team `add-member`). The team controller runs that block on their machine, then syncs the signed team state into aweb cloud:
-
-```bash
-aw id team import-request --team <team> --namespace <namespace> --cloud-team-id <cloud-team-id> --apply
-```
-
-aweb cloud projects the customer-signed facts; it does not mint anything itself. For roster changes (add or remove members), the customer controller modifies signed team state and runs `import-request --apply` again to sync.
-
-**Case 3 — Same-machine local-controller invite-token convenience.** When the team controller key is on the same machine you're inviting from, you can use the invite-token flow as a shortcut. Two variants:
-
-```bash
-# Owner side, same machine, local-controller key present:
-aw team invite                 # local-workspace member (default)
-aw team invite --global        # global-member token (requires existing global identity in the accepting directory)
-
-# Joiner side (still same machine, different directory):
-
-# For a local invite:
-aw team join <token> --name <name>
-
-# For a global invite, the accepting directory must already have a global identity:
-aw id create --domain <domain> --name <name>
-aw team join <token> --address <namespace>/<name>
-```
-
-For the `--global` case, `accept-invite` does NOT create the global identity — it errors with `no identity found; run aw id create first, or use --local invite` if no identity is present. `--address` selects the registered address to place in the persistent team certificate; the address must resolve to the accepting identity's `did:aw`/`did:key`.
-
-This is the local-controller convenience case only. For cross-machine BYOT joins, use Case 1.
-
-### Not a membership path: human dashboard invites
-
-`/api/v1/teams/.../invite` in the dashboard sends email invitations for **human users** to join the team's dashboard view (with a dashboard role like Owner/Admin/Member). That is independent of AWID agent membership certificates. Do not mix: human dashboard invites do not create agent team-certs and vice versa.
-
-## Accepting an invite vs fetching a certificate
-
-Two distinct local actions install a membership:
-
-- **`aw team join <token>`** (human-facing alias for `aw id team accept-invite <token>`) — redeems a CLI invite token. For hosted invites (Path 3), generates a fresh self-custodial identity in the current directory (refusing to overwrite) and installs the certificate; default is local, while `--address <domain>/<name>` creates/registers a fresh global identity through the hosted service before certificate install. For local-controller same-machine invites (BYOT Case 3), local-member behaves the same way as hosted local; global accepts require an existing global identity (from `aw id create`) and attach a team certificate to it via `--address <namespace>/<name>`.
-- **`aw id team fetch-cert --namespace <namespace> --team <team> --cert-id <id>`** — installs a certificate that has already been minted server-side (by hosted "Add existing identity") or signed by a controller (BYOT `add-member`). Used for hosted Path 2 and BYOT Case 1.
-
-If you have a token, use `aw team join` (or the underlying primitive `aw id team accept-invite`). If you have a `cert-id` printed by the dashboard or controller, use `fetch-cert`.
-
-## Multiple team memberships
-
-One identity can hold multiple team certificates simultaneously — one per team — all stored in `.aw/team-certs/`. Which one is in effect for a given command — and therefore which team's coordination state the command reaches — comes from either the `active_team:` selection in `.aw/teams.yaml` or a per-command `--team <team-id>` argument that overrides it for that one invocation.
-
-```bash
-aw team list                             # see memberships
-aw team switch <team>:<namespace>        # update teams.yaml's active_team
-aw <verb> --team <team>:<namespace> ...  # one-off override for team-scoped commands
-aw team leave <team>:<namespace>         # remove a local membership
-```
-
-Acting in the wrong active team can send messages, claims, or locks to the wrong coordination boundary. Switch persistently only when the workspace's ongoing work should move; otherwise use the per-command override.
-
-If the recipient's `inbound_mode` is `team-and-contacts`, valid same-team membership is one of the authorization paths for delivery to them. The full inbound-mode model is in `aweb-identity`.
-
-## Fresh BYOT setup into aweb cloud
-
-Use this flow when the user controls DNS for a domain and wants to create a customer-controlled AWID team, add agents, and import/sync it into app.aweb.ai.
-
-Vocabulary:
-
-- The namespace is the domain, e.g. `juanreyero.com`.
-- The team is named inside that namespace, e.g. `personal`; its AWID team id is `personal:juanreyero.com`.
-- Agents have addresses under the namespace, e.g. `juanreyero.com/alpha`.
-- Do not call `personal:juanreyero.com` an agent; it is the team id.
-
-Before starting, confirm `aw version` includes `aw id namespace prepare-controller` and `aw id namespace check-txt`; older `aw` versions make this flow hard to drive from non-interactive harnesses.
-
-**Use `aw id create`, NOT `aw init --byod --global`, for the identity-prep commands in this section.** `aw init --byod --global` is workspace onboarding: it bootstraps the directory and connects it to the `default:<domain>` team on app.aweb.ai (the team created during BYOD onboarding), writing `workspace.yaml`, joining that team, and minting a team certificate. That short-circuits the controller-signed team-state import this section is about. `aw id create` only mints the identity in AWID and writes `.aw/identity.yaml` + `.aw/signing.key`, leaving the team membership for the customer controller to add and sign. If a user already ran the wrong command and needs to recover, see the matching diagnostic bullet in `aweb-identity`'s readiness checks.
-
-Namespace controller setup (does not create an identity or team):
-
-```bash
-aw id namespace prepare-controller --domain <domain>
-```
-
-Pause and have the human add the printed `_awid.<domain>` TXT record. Do not invent DNS values. Tell the human to back up `~/.awid` now; it contains the namespace controller key. After DNS propagates, verify it:
-
-```bash
-aw id namespace check-txt --domain <domain>
-```
-
-Then create the BYOT team with the namespace controller key:
-
-```bash
-aw id team create --namespace <domain> --name <team> --display-name "<display name>"
-```
-
-After team creation, tell the human to back up `~/.awid` again; it now also contains the team controller key under `~/.awid/team-keys/<domain>/<team>.key`.
-
-Add initial global agents:
-
-```bash
-aw id create --domain <domain> --name alpha
-aw id team add-member --team <team> --namespace <domain> --did <alpha_did_key> --name alpha --global --did-aw <alpha_did_aw>
-
-aw id create --domain <domain> --name beta
-aw id team add-member --team <team> --namespace <domain> --did <beta_did_key> --name beta --global --did-aw <beta_did_aw>
-```
-
-Use the actual `did`/`did_aw` values printed by `aw id create`. Do not guess them.
-
-Register with aweb cloud without using the dashboard:
-
-```bash
-aw id team register --service https://app.aweb.ai --team <team>:<domain>
-```
-
-This signs a service-registration request with the team controller key. It creates or syncs an aweb projection of the AWID team, but it does not upload controller private keys, create identities, or initialize any agent workspace. Read the returned next steps and run the required workspace connection command from each already-certified agent directory:
-
-```bash
-aw workspace connect --service https://app.aweb.ai --team <team>:<domain>
-# equivalent service-oriented primitive: aw service init --service https://app.aweb.ai --team <team>:<domain>
-```
-
-`aw workspace connect` / `aw service init` requires the local `.aw/signing.key`, `.aw/teams.yaml`, and `.aw/team-certs/*.pem` for that agent. If the certificate is not installed yet, fetch it first with the certificate id returned by `aw id team add-member`:
+Use the provider commands from the instance home (or with `--home <path>`):
 
 ```bash
-aw id team fetch-cert --namespace <domain> --team <team> --cert-id <cert-id>
+oats aweb teams --json                  # personal, eligible, joined, unmapped
+oats aweb join --labels <label>[,<label>]   # join eligible workspace labels
+oats aweb leave --labels <label>[,<label>]  # leave joined wider-team labels
 ```
 
-After at least one workspace is initialized, the service may suggest a human-claim command such as:
+- The personal team cannot be left; attempting it is `E_TEAM_PERSONAL`.
+- A label that is not eligible for this soul/workspace is `E_TEAM_NOT_ELIGIBLE`.
+- Joined wider teams use a local identity home such as
+  `<home>/.aweb-identity-<label>` and receive by polling in oats.aweb 1.14. Joined teams require aw >= 1.36.12. The provider creates joined homes with `aw id team accept-invite` under `--identity-home`, verifies the root auto-connected, and does not run `aw init` inside the per-team home.
+- Send as a joined team with exactly:
 
 ```bash
-aw claim-human --email you@example.com
+aw --identity-home <identityHome> mail|chat ...
 ```
 
-`claim-human` is a service-account/human-login step for billing and dashboard ownership. It is not AWID team-controller authority and it does not add members to the BYOT team.
+`oats aweb teams --json` prints each joined entry's `identityHome` and
+`receive` mode.
 
-Import into an existing aweb organization:
+## Readiness checks
 
-1. In app.aweb.ai, create or select the owner organization that should contain the imported team.
-2. Open the BYOT import flow. Prefer the command shown by the dashboard because it contains the correct `--organization-id`.
-3. First preview:
+Start with read-only diagnostics:
 
 ```bash
-aw id team import-request --team <team> --namespace <domain> --organization-id <org-id>
-```
-
-Paste the signed output and use Preview.
-
-4. If the preview is correct, regenerate an apply request:
-
-```bash
-aw id team import-request --team <team> --namespace <domain> --organization-id <org-id> --apply
-```
-
-Paste it and use Import / sync.
-
-Sync later changes:
-
-- After the team exists in aweb cloud, use `--cloud-team-id <cloud-team-id>` instead of `--organization-id`.
-- The dashboard Connect / Sync page should show the exact command. Prefer that command.
-
-```bash
-aw id team import-request --team <team> --namespace <domain> --cloud-team-id <cloud-team-id> --apply
+aw workspace status
+oats aweb teams --json
+aw team list
+aw id cert show
 ```
 
-## Diagnostic recipes
-
-### "I am in two teams; what does that entail?"
-
-Treat teams as separate coordination boundaries for tasks, locks, roles, instructions, presence, and same-team aliases. Global mail/chat first contact uses explicit address routes (`<namespace>/<alias>`); continuations reuse the route already recorded for that conversation/participant. Confirm `active_team:` in `teams.yaml` before relying on local aliases, claiming work, or choosing sender context — or use `--team <team-id>` for a one-off override.
-
-### "Team cert or active team mismatch"
-
-Inspect `.aw/teams.yaml` and `.aw/team-certs/`. Confirm:
-- a `.pem` file exists for each team you expect to be a member of;
-- `teams.yaml`'s `active_team:` matches the team you actually want commands to land in;
-- `aw team list` agrees with both.
-
-Switch with `aw team switch <team-id>`, or reinitialize only after confirming with the team owner/coordinator.
-
-### "X says they cannot reach me"
-
-First check the route + inbound mode on the recipient side — full model in `aweb-identity`. Then, for `team-and-contacts` recipients, check shared team membership:
-
-1. `aw team list` on both sides — do you have a certificate in a common team?
-2. `.aw/team-certs/` — is the certificate present for that team?
-3. Whether the recipient considers your team certificate current (a rotated key on your side requires a re-issued certificate; see `aweb-identity` for rotation).
-
-### "I joined a team but commands hit the wrong one"
-
-The new membership added a `.pem` to `team-certs/` and a row in `teams.yaml`, but `active_team:` may not have updated. Run `aw team switch <new-team-id>` to update the default, or pass `--team <new-team-id>` to specific commands.
+Interpret common states:
+
+- `teams.personal.team` is the primary personal team identity wired to the
+  harness.
+- `eligible[]` are labels this soul/workspace may explicitly join; the primary
+  label may appear here and is joinable/leavable like any other wider team.
+- `joined[]` are provider-created wider-team memberships; each has an
+  `identityHome`, `since`, and `receive` (`poll` in 1.14).
+- `unmapped[]` labels are present on the soul but not mapped by the workspace.
+  An unmapped primary falls back to the personal/root active team with a
+  `team-unmapped` warning; it is not a spawn blocker.
+- `teams-unverified` on launch means the kernel supplied recorded/unknown team
+  data, so the provider kept memberships instead of leaving anything.
+
+## Team vocabulary
+
+- **Team id**: canonical form `<name>:<namespace>` (for example
+  `default:oats.aweb.ai`).
+- **Team certificate**: a signed membership statement for an identity; stored in
+  `.aw/team-certs/` for native identities.
+- **Personal team**: the default team for the instance's primary identity. In
+  1.14.1, until per-workspace personal teams are available, this may be the
+  person's default team as a stand-in.
+- **Joined team**: an explicit wider team joined through `oats aweb join`, with a
+  separate local identity home in this release.
+
+## Hosted vs BYOT authority (diagnostic context)
+
+Hosted teams are signed by aweb-held team authority; BYOT teams are signed by a
+customer-held controller. This matters when diagnosing why a human or provider
+cannot mint a certificate, but ordinary OATS agents should still use
+`oats aweb join|leave` rather than native membership mutation commands. If a
+join reports authorization failure, ask the team's owner/admin for the needed
+invite or mapping; do not invent a native workaround.
+
+## Wrong team symptoms
+
+If commands appear to use the wrong team:
+
+1. Run `oats aweb teams --json` and confirm which identity home should send.
+2. For the primary identity, run `aw workspace status` and `aw team list`.
+3. For a joined team, run `aw --identity-home <identityHome> mail inbox` or
+   `aw --identity-home <identityHome> chat pending` and send with the same
+   `--identity-home`.
+4. If the provider state and native files disagree, report the exact output to a
+   coordinator; do not hand-edit `.aw` or `.oats-aweb/teams.json`.
 
 ## References
 
-Read these only when deeper context is needed:
+Read only when deeper context is needed:
 
-- `references/team-membership-reference.md`: detailed hosted/BYOT and diagnostic notes.
 - <https://aweb.ai/docs/teams/>: team model.
-- <https://github.com/awebai/aweb/blob/main/docs/byot-onboarding-contract.md>: fully hosted vs BYOT contract.
-- <https://aweb.ai/docs/agent-guide/>: full agent guide.
+- <https://aweb.ai/docs/agent-guide/>: agent messaging guide.

package/docs/capabilities.md

@@ -118,7 +118,9 @@ A self-contained package has an `oats.json`:
   record can never be empty: a quarantine exists because something is outstanding,
   and one claiming otherwise would give the retry nothing to prove. A marker failing any of
   that is no more retryable than a missing one, and is treated as missing so the
-  escape hatch works.
+  escape hatch works. `--force` never skips work preservation, which runs
+  before the retire hooks and refuses with `E_WORK_PRESERVATION_FAILED` when
+  its recovery cannot be verified.
 - A retry clears the quarantine only by **proving the outstanding work happened**:
   every retire hook the marker records as owing cleanup must have run and reported
   success, and every Git step it records must be re-run and verified. A retry that resolves no