run402 4.94.0 → 4.96.0

package/lib/messages.mjs

@@ -42,15 +42,15 @@ const ROOM_FLAGS = ["--project", "--org", "--room"];
 const HELP = `run402 messages — room-visible messages between agents
 
 Usage:
-  run402 messages send <body> [--to <names>] [--ack] [--thread <id>]
-  run402 messages list [--unread] [--cursor <mcr_...>] [--thread <id>]
-  run402 messages wait [--addressed-to me] [--thread <id>] [--timeout <s>] [--cursor <mcr_...>]
+  run402 messages send <body> [--to <names>] [--ack] [--thread <thread>]
+  run402 messages list [--unread] [--cursor <mcr_...>] [--thread <thread>]
+  run402 messages wait [--addressed-to me] [--thread <thread>] [--timeout <s>] [--cursor <mcr_...>]
   run402 messages get <message_id>
   run402 messages ack <message_id>
 
 Addressing (all subcommands):
-  --project <id>    That project's DEFAULT room (the room key IS the project id)
-  --org <id> --room <key>   A named org room
+  --project <project_id>    That project's DEFAULT room (the room key IS the project id)
+  --org <org_id> --room <key>   A named org room
   (omit both)       Resolved from RUN402_ROOM, a .run402.json binding, or the
                     wallet profile's selected org
 

package/lib/next-actions.mjs

@@ -81,7 +81,7 @@ export function upDeployAction() {
 }
 
 /**
- * `repos create` (and `gitvault init`) on an org with no slug set: the
+ * `repos create` (and `vault init`) on an org with no slug set: the
  * response's `address: null` had no pointer to WHY, or to the named-addressing
  * feature at all. Owner-only. Wording deliberately
  * omits a price: the first slug per org is free, and renames/re-claims cost
@@ -90,7 +90,7 @@ export function upDeployAction() {
  */
 export function setOrgSlugAction() {
   return nextAction("set_org_slug", {
-    command: "run402 org slug <slug>",
+    command: "run402 orgs slug <slug>",
     why: "This organization has no slug set yet, so its repos have no run402::<slug>/<name> address. Owner-only.",
   });
 }

package/lib/org-context.mjs

@@ -11,7 +11,7 @@
  * organization named directly outranks one derived from a project named in that
  * same class:
  *
- *   1. flag          --org <org_id>           else --project <id> -> its org
+ *   1. flag          --org <org_id>           else --project <project_id> -> its org
  *   2. environment   RUN402_ORG, else the org else RUN402_PROJECT_ID -> its org
  *                    half of RUN402_ROOM
  *   3. binding       the `org` key of the nearest .run402(.local).json
@@ -57,7 +57,7 @@ export const ROOM_ENV = "RUN402_ROOM";
 export const PROJECT_ENV = "RUN402_PROJECT_ID";
 
 /** Command groups that must stay usable while selection is ambiguous. */
-const CONFLICT_EXEMPT = new Set(["org", "wallets", "doctor"]);
+const CONFLICT_EXEMPT = new Set(["orgs", "wallets", "doctor"]);
 
 /** `org_id` is a UUID at every API boundary (`uuidParam` on every route). */
 const ORG_ID_RE = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
@@ -78,7 +78,7 @@ function assertOrgIdShape(orgId, origin) {
   fail({
     code: "BAD_ORG_ID",
     message: `Invalid organization id ${JSON.stringify(describeRejectedValue(orgId))} (from ${origin}).`,
-    hint: "An org_id is a UUID. Run 'run402 org list' to see the organizations you belong to.",
+    hint: "An org_id is a UUID. Run 'run402 orgs list' to see the organizations you belong to.",
     details: { org_id: describeRejectedValue(orgId), origin },
     next_actions: [listOrgsAction()],
   });
@@ -97,15 +97,15 @@ function orgFromRoomEnv(env) {
  * `r402.orgId` from `cwd`'s LOCAL git config (kygit-handoff design D10) —
  * best-effort, gracefully degrading like `findBindingKey`: no repository,
  * no pin, or a shape-invalid value all answer `null` rather than throwing,
- * so a bare directory or a checkout with no gitvault remote costs nothing.
+ * so a bare directory or a checkout with no vault remote costs nothing.
  * Checks a real vault checkout's pin first (gated on `r402.repoId`), then
  * falls back to the bare org/room pin a room-only `rooms join <key>` writes
  * in a directory with no vault at all (add-room-invite design D10).
  */
-async function readGitvaultPinnedOrgId(cwd) {
+async function readVaultPinnedOrgId(cwd) {
   try {
-    const { readPinnedGitvaultRepo, readPinnedRoomBinding } = await import("#sdk/node");
-    const pinned = await readPinnedGitvaultRepo(cwd);
+    const { readPinnedVaultRepo, readPinnedRoomBinding } = await import("#sdk/node");
+    const pinned = await readPinnedVaultRepo(cwd);
     const orgId = trimmed(pinned?.org_id);
     if (orgId && ORG_ID_RE.test(orgId)) return orgId;
     const bare = await readPinnedRoomBinding(cwd);
@@ -118,7 +118,7 @@ async function readGitvaultPinnedOrgId(cwd) {
 
 function listOrgsAction() {
   return nextAction("edit_request", {
-    command: "run402 org list",
+    command: "run402 orgs list",
     why: "List the organizations this wallet belongs to.",
   });
 }
@@ -126,7 +126,7 @@ function listOrgsAction() {
 function orgRequiredActions() {
   return [
     nextAction("edit_request", {
-      command: "run402 org use <org_id>",
+      command: "run402 orgs use <org_id>",
       why: "Select a current organization for this wallet profile.",
     }),
     listOrgsAction(),
@@ -254,19 +254,19 @@ export async function resolveOrg(input = {}, opts = {}) {
   }
   if (bindingOrg) return { orgId: bindingOrg, source: "binding", sourceDetail: bindingHit.file };
 
-  // --- Class 3.5: gitvault local pin (kygit-handoff design D10) ------------
+  // --- Class 3.5: vault local pin (kygit-handoff design D10) ------------
   // `r402.orgId` in this checkout's LOCAL git config — written by every
-  // gitvault pin site (`repos create`, `resume`, address resolution), a
+  // vault pin site (`repos create`, `resume`, address resolution), a
   // rung below env/binding and above profile state: a checkout that IS a
   // resumed/pinned vault should resolve its own org with zero configuration,
   // but an explicit env var or a committed `.run402.json` binding still wins.
-  const pinnedOrg = await readGitvaultPinnedOrgId(cwd);
-  if (pinnedOrg) return { orgId: pinnedOrg, source: "gitvault_pin", sourceDetail: "r402.orgId (local git config)" };
+  const pinnedOrg = await readVaultPinnedOrgId(cwd);
+  if (pinnedOrg) return { orgId: pinnedOrg, source: "vault_pin", sourceDetail: "r402.orgId (local git config)" };
 
   // --- Class 4: profile state ----------------------------------------------
   const selected = trimmed(coreGetActiveOrgId());
   if (selected) {
-    return { orgId: assertOrgIdShape(selected, "org use"), source: "profile", sourceDetail: "org use" };
+    return { orgId: assertOrgIdShape(selected, "orgs use"), source: "profile", sourceDetail: "orgs use" };
   }
   const activeProject = trimmed(getActiveProjectId());
   if (activeProject) {
@@ -278,7 +278,7 @@ export async function resolveOrg(input = {}, opts = {}) {
   fail({
     code: "ORG_REQUIRED",
     message: "No organization specified and no current organization set.",
-    hint: `Pass --org <org_id>, set ${ORG_ENV}, bind this directory in .run402.json, or run: run402 org use <org_id>`,
+    hint: `Pass --org <org_id>, set ${ORG_ENV}, bind this directory in .run402.json, or run: run402 orgs use <org_id>`,
     next_actions: orgRequiredActions(),
   });
   return null; // unreachable — fail() exits
@@ -301,17 +301,17 @@ export async function resolveOrgId(a, opts = {}) {
  * Every Org-Scoped Command").
  *
  * `<org_id>` is optional sugar on every verb that acts on an organization —
- * `org get`, `org member add`, `billing link-wallet`, … A leading positional
+ * `orgs get`, `orgs members add`, `billing link-wallet`, … A leading positional
  * that IS an org id (a UUID) addresses that org; anything else is the verb's
  * own next positional (a wallet, an email, a principal) and the org comes from
  * the shared chain: `--org`, then `RUN402_ORG`, then the `.run402.json`
- * binding, then `org use`. So inside a bound checkout the two-agent case reads
- * `run402 org member add 0xB… --role developer` with nothing else to know.
+ * binding, then `orgs use`. So inside a bound checkout the two-agent case reads
+ * `run402 orgs members add 0xB… --role developer` with nothing else to know.
  *
  * Naming the org twice with different values (positional AND `--org`) is
  * `AMBIGUOUS_ORG`, never a silent pick — the same refusal the env-vs-binding
  * pair gets. A non-org first positional with no chain answer fails
- * `ORG_REQUIRED` and NAMES the rejected value, so `org get foo` says why `foo`
+ * `ORG_REQUIRED` and NAMES the rejected value, so `orgs get foo` says why `foo`
  * did not count rather than reporting a bare "no organization".
  *
  * Returns the org id with provenance plus the REMAINING positionals; bound
@@ -350,7 +350,7 @@ export async function takeOrgPositional(a, valueFlags = [], opts = {}) {
     message: typeof first === "string"
       ? `No organization specified and no current organization set (${JSON.stringify(first)} is not an org_id — an org_id is a UUID).`
       : "No organization specified and no current organization set.",
-    hint: `Pass --org <org_id> (or a leading <org_id> positional), set ${ORG_ENV}, bind this directory in .run402.json, or run: run402 org use <org_id>`,
+    hint: `Pass --org <org_id> (or a leading <org_id> positional), set ${ORG_ENV}, bind this directory in .run402.json, or run: run402 orgs use <org_id>`,
     ...(typeof first === "string" ? { details: { rejected_positional: first } } : {}),
     next_actions: orgRequiredActions(),
   });
@@ -388,7 +388,7 @@ export function getSelectedOrgId() {
 }
 
 /** Record the profile's selected organization. */
-export function setSelectedOrgId(orgId, origin = "org use") {
+export function setSelectedOrgId(orgId, origin = "orgs use") {
   coreSetActiveOrgId(assertOrgIdShape(orgId, origin));
 }
 
@@ -434,7 +434,7 @@ export function orgProvenance(resolved) {
  * owns THIS project id", which is what a project-scoped scaffold needs and
  * where an `--org` override would be a mis-binding, not a convenience.
  *
- * WHY IT CACHES (task 5.12c): the gitvault scaffold is the one part of
+ * WHY IT CACHES (task 5.12c): the vault scaffold is the one part of
  * `run402 init` the client-surface spec says adds no network dependency to the
  * cold-start path, and resolving the org through `projects.list()` quietly made
  * that untrue. `org_id` is a non-secret routing identifier the control plane