@snowyroad/braid 0.92.3 → 0.93.1

package/dist/cli.js

@@ -29,7 +29,9 @@ import {
   classifyFatal,
   configDir,
   createAdapter,
+  createWorkspaceNoticeGate,
   decodeInvite,
+  distinctWorkspaceNames,
   effectiveAnthropicCredential,
   handoffCwdFor,
   hasSubscriptionLogin,
@@ -69,10 +71,12 @@ import {
   startingLines,
   toolModeLabel,
   toolStatusLine,
+  updateAgentWorkspace,
   validateRelayWsUrl,
   wsToHttp
-} from "./chunk-WJ2X7ILC.js";
+} from "./chunk-KBWVFEO5.js";
 import {
+  clampUntrusted,
   externalSourceLabel,
   externalUntrustedPreamble,
   fence,
@@ -85,7 +89,7 @@ import {
   sameText,
   untrustedPreamble,
   utext
-} from "./chunk-BDOF72CL.js";
+} from "./chunk-HQNAAXUM.js";
 
 // src/health.ts
 var CEILING_STRIKES_TO_DEAD = 3;
@@ -263,7 +267,7 @@ ${fence("flow discussion history", joinUntrusted(lines, "\n"))}
 
 `;
 }
-function buildFlowPrompt(signal, agentName, channelId, toolMode = "readonly", cause = "operator") {
+function buildFlowPrompt(signal, agentName, channelId, toolMode = "readonly", cause = "operator", channelName) {
   if (signal.kind === "direction") {
     const candidates = joinUntrusted(signal.candidates ?? [], ", ");
     const history2 = renderFlowHistory(signal.history);
@@ -298,8 +302,9 @@ function buildFlowPrompt(signal, agentName, channelId, toolMode = "readonly", ca
 ${toolStatusLine(toolMode, cause)}
 
 ${header}
-CHANNEL: ${channelId}
-FLOW: ${signal.flowId}
+` + (channelName ? `CHANNEL:
+${fence("channel name", clampUntrusted(channelName, 60))}
+` : ``) + `FLOW: ${signal.flowId}
 TOPIC:
 ${fence("flow topic", signal.topic)}
 ` + role + ctx + synth + "\n" + history + closer;
@@ -357,7 +362,7 @@ function externalTaintOf(messages) {
   return { preambleLabel: "an external source", fenceLabel: "external message" };
 }
 var ChannelSession = class {
-  constructor(adapter, onReply, agentName, channelId, flow, fetchContext, beacon, toolMode = "readonly", holdCatchUpMaxMentions = 3, fetchPrivateContext) {
+  constructor(adapter, onReply, agentName, channelId, flow, fetchContext, beacon, toolMode = "readonly", holdCatchUpMaxMentions = 3, fetchPrivateContext, channelName) {
     this.adapter = adapter;
     this.onReply = onReply;
     this.agentName = agentName;
@@ -368,6 +373,7 @@ var ChannelSession = class {
     this.toolMode = toolMode;
     this.holdCatchUpMaxMentions = holdCatchUpMaxMentions;
     this.fetchPrivateContext = fetchPrivateContext;
+    this.channelName = channelName;
   }
   adapter;
   onReply;
@@ -379,6 +385,7 @@ var ChannelSession = class {
   toolMode;
   holdCatchUpMaxMentions;
   fetchPrivateContext;
+  channelName;
   session = null;
   roster = [];
   /** Replace the known peer roster (situational facts surfaced per message). */
@@ -500,8 +507,11 @@ ${toolStatusLine(mode, cause)}
 ${fence("reply parent sender", msg.replyTo.senderName)}
 ${fence("reply parent content", msg.replyTo.content)}
 `;
-    const head = this.promptHead(effectiveMode, externalLabel) + privateContext + channelContext + `You are ${this.agentName} observing a message in Braid channel ${this.channelId}.
-` + // BL-057 D-b1: fixed wording only — senderName is UntrustedText and must never
+    const channelLabel = this.channelName?.(this.channelId);
+    const head = this.promptHead(effectiveMode, externalLabel) + privateContext + channelContext + (channelLabel ? `You are ${this.agentName} observing a message in a Braid channel named:
+${fence("channel name", clampUntrusted(channelLabel, 60))}
+` : `You are ${this.agentName} observing a message in a Braid channel.
+`) + // BL-057 D-b1: fixed wording only — senderName is UntrustedText and must never
     // appear outside a fence (the fenced identity block above already carries it).
     (msg.channelKind === "dm" ? "This is a direct message between you and the sender identified above. Reply directly; no mention is needed.\n" : "") + `This message's id is ${msg.id} (use it as message_id if you decide to react to this message).
 FROM:
@@ -539,7 +549,14 @@ ${fence("reactions", formatReactions(msg.reactions))}
       if (history.length === 0) history = await this.flow.fetchHistory(signal.flowId);
       const effectiveMode = narrowestMode(this.lastBundleMode, this.toolMode);
       const cause = effectiveMode === "readonly" && this.toolMode !== "readonly" ? "channel" : "operator";
-      const prompt = buildFlowPrompt({ ...signal, history }, this.agentName, this.channelId, effectiveMode, cause);
+      const prompt = buildFlowPrompt(
+        { ...signal, history },
+        this.agentName,
+        this.channelId,
+        effectiveMode,
+        cause,
+        this.channelName?.(this.channelId)
+      );
       const reply = await this.session.converseLocal(capPrompt(prompt), narrowestOverride(effectiveMode, this.toolMode));
       await this.flow.postReply(signal.flowId, reply.trim() || "(no response)", void 0, signal.dispatchId);
     } finally {
@@ -586,6 +603,10 @@ ${fence("reactions", formatReactions(msg.reactions))}
     const effectiveMode = narrowestMode(bundleMode, this.toolMode, externalMode);
     const overrideMode = narrowestOverride(effectiveMode, this.toolMode);
     const transcriptLabel = taint ? taint.fenceLabel : "missed channel messages";
+    const channelLabel = this.channelName?.(this.channelId);
+    const reconnectedClause = channelLabel ? `You just reconnected to a Braid channel named:
+${fence("channel name", clampUntrusted(channelLabel, 60))}
+after being away. ` : `You just reconnected to this Braid channel after being away. `;
     const transcript = joinUntrusted(
       result.context.map((m) => utext`[${m.createdAt}] ${firstNonEmpty([m.senderName, m.senderId], "someone")}: ${m.content}${m.reactions && m.reactions.length ? utext` [reactions: ${formatReactions(m.reactions)}]` : utext``}`),
       "\n"
@@ -595,7 +616,7 @@ ${fence("reactions", formatReactions(msg.reactions))}
       this.beacon?.begin();
       try {
         await this.session.converseLocal(capPrompt(
-          this.promptHead(effectiveMode, taint?.preambleLabel) + `You just reconnected to Braid channel ${this.channelId} after being away. Here is what you missed (context only, do NOT reply to it):
+          this.promptHead(effectiveMode, taint?.preambleLabel) + reconnectedClause + `Here is what you missed (context only, do NOT reply to it):
 ` + fence(transcriptLabel, transcript)
         ), overrideMode);
       } finally {
@@ -610,7 +631,9 @@ ${fence("reactions", formatReactions(msg.reactions))}
       result.mentions.map((m) => utext`[${m.createdAt}] ${firstNonEmpty([m.senderName, m.senderId], "someone")}: ${m.content}`),
       "\n"
     );
-    const head = this.promptHead(effectiveMode, taint?.preambleLabel) + privateContext + channelContext + `You are ${this.agentName}. You just reconnected to Braid channel ${this.channelId} after being away. While you were gone, the channel said (context):
+    const head = this.promptHead(effectiveMode, taint?.preambleLabel) + privateContext + channelContext + `You are ${this.agentName}. ` + (channelLabel ? `You just reconnected to a Braid channel named:
+${fence("channel name", clampUntrusted(channelLabel, 60))}
+after ` : `You just reconnected to this Braid channel after `) + `being away. While you were gone, the channel said (context):
 ${fence(transcriptLabel, transcript)}
 
 You were directly addressed (@mentioned) in:
@@ -641,6 +664,10 @@ ${fence(taint ? taint.fenceLabel : "messages mentioning you", addressed)}
     const effectiveMode = narrowestMode(bundleMode, this.toolMode, externalMode);
     const overrideMode = narrowestOverride(effectiveMode, this.toolMode);
     const transcriptLabel = taint ? taint.fenceLabel : "recent channel messages";
+    const channelLabel = this.channelName?.(this.channelId);
+    const joinedClause = channelLabel ? `You just joined a Braid channel named:
+${fence("channel name", clampUntrusted(channelLabel, 60))}
+Here is the recent discussion so far ` : `You just joined this Braid channel. Here is the recent discussion so far `;
     const transcript = joinUntrusted(
       history.map((m) => utext`[${m.createdAt}] ${firstNonEmpty([m.senderName, m.senderId], "someone")}: ${m.content}`),
       "\n"
@@ -648,7 +675,7 @@ ${fence(taint ? taint.fenceLabel : "messages mentioning you", addressed)}
     this.beacon?.begin();
     try {
       await this.session.converseLocal(capPrompt(
-        this.promptHead(effectiveMode, taint?.preambleLabel) + `You just joined Braid channel ${this.channelId}. Here is the recent discussion so far (context only, do NOT reply to it):
+        this.promptHead(effectiveMode, taint?.preambleLabel) + joinedClause + `(context only, do NOT reply to it):
 ` + fence(transcriptLabel, transcript)
       ), overrideMode);
     } finally {
@@ -2508,7 +2535,16 @@ async function startBridge(cfg, relay, deps) {
         cfg.catchUpMaxMentions,
         // BL-056 task 7: PHYSICALLY SEPARATE from fetchChannelContext above — this
         // agent's own private-memory lane, never the shared channel path.
-        (queryHint) => relay.fetchPrivateMemoryContext(queryHint)
+        // D12 task 7.2: thread this session's own channelId (closure-bound above)
+        // so the relay org-scopes recall to it, and the channelNames lookup (same
+        // map/pattern as the handoff controller's channelName resolver, line ~647)
+        // so a channel-scoped hit's attribution renders the channel NAME, never
+        // its raw UUID (G7).
+        (queryHint) => relay.fetchPrivateMemoryContext(channelId, queryHint, (id) => channelNames.get(id)),
+        // D12 task 7.2 (review follow-up): the SAME channelNames resolver, threaded so
+        // ChannelSession's own situational framing lines ("You are X observing a message
+        // in Braid channel <NAME>") never fall back to the raw UUID either (G7).
+        (id) => channelNames.get(id)
       );
       const broker = new SourceBroker(channelId, relay);
       const brokerInfo = await broker.start();
@@ -2654,7 +2690,12 @@ async function startBridge(cfg, relay, deps) {
     });
     const handoffCtl = cs.handoffGate ? makeSocketHandoffController({
       sessions,
-      channelName: (id) => channelNames.get(id),
+      // Display path (handoff picker/banner): unwrap the branded name for the
+      // TTY. String() is the sanctioned display unwrap (not a prompt sink).
+      channelName: (id) => {
+        const u = channelNames.get(id);
+        return u === void 0 ? void 0 : String(u);
+      },
       provider: cfg.agent,
       cwdFor: (id) => handoffCwdFor(cfg, id),
       scope: cfg.scope,
@@ -4547,6 +4588,10 @@ function renderStatusHuman(input) {
     );
     const ipcProfile = resolveIpcProfile(e.agent.scope, void 0);
     lines.push(`  ipcprofile: ${ipcProfile}  (${e.agent.scope?.ipcProfile !== void 0 ? "file" : "default"})`);
+    if (e.agent.workspace) lines.push(`  workspace: ${sanitizeForTty(e.agent.workspace)}`);
+    if (e.agent.channelWorkspaces && e.agent.channelWorkspaces.length > 1) {
+      lines.push(`  channels in: ${e.agent.channelWorkspaces.map((w) => sanitizeForTty(w)).join(", ")}`);
+    }
     const eps = endpointRows(e, k, input);
     for (const ep of eps) {
       const state = ep.kind === "env" ? "auto-allowed (env)" : ep.pinned ? `pinned ${ep.pinnedAt}` : "NOT PINNED \u2014 pending approval";
@@ -4579,7 +4624,11 @@ function renderStatusJson(input) {
         }
       },
       ipcProfile: { value: ipcProfile, origin: e.agent.scope?.ipcProfile !== void 0 ? "file" : "default" },
-      endpoints: endpointRows(e, k, input)
+      endpoints: endpointRows(e, k, input),
+      // Task 7.1 (D4): null (not "personal"/omitted key) when never cached, so machine
+      // consumers can distinguish "no data yet" from an actual value.
+      workspace: e.agent.workspace ?? null,
+      channelWorkspaces: e.agent.channelWorkspaces ?? []
     };
   });
   return JSON.stringify({ agents }, null, 2);
@@ -6374,6 +6423,18 @@ async function main() {
     onRelayCreated: (relay) => {
       relayRef.current = relay;
       relay.onConnEvent((e) => connStatus.handle(e));
+      const workspaceNoticeGate = createWorkspaceNoticeGate();
+      relay.onHello(({ channelOrgs, agentWorkspace }) => {
+        const notice = workspaceNoticeGate(channelOrgs);
+        if (notice.length > 0) console.log(banner("braid", "WORKSPACES", notice));
+        if (cfg.agentName) {
+          const channelWorkspaces = distinctWorkspaceNames(channelOrgs);
+          updateAgentWorkspace(configDir(process.env), cfg.agentName, {
+            ...agentWorkspace ? { workspace: agentWorkspace } : {},
+            ...channelWorkspaces.length > 0 ? { channelWorkspaces } : {}
+          });
+        }
+      });
     }
   });
   if (cfg.runtimeVersion) {
@@ -6394,12 +6455,15 @@ async function main() {
   const channelLabel = (channelId) => {
     const name = bridge.channelNames.get(channelId);
     const tag = sanitizeForTty(channelId).slice(0, 8);
-    return name ? `#${sanitizeForTty(name).slice(0, 40)} (${tag})` : `#${tag}`;
+    return name ? `#${sanitizeForTty(String(name)).slice(0, 40)} (${tag})` : `#${tag}`;
   };
   attach = startAttach({
     hub: bridge.hub,
     listChannels: () => [...bridge.sessions.keys()],
-    channelName: (channelId) => bridge.channelNames.get(channelId),
+    channelName: (channelId) => {
+      const u = bridge.channelNames.get(channelId);
+      return u === void 0 ? void 0 : String(u);
+    },
     stdin: process.stdin,
     stdout: stickyWriteThrough(sticky, process.stdout),
     onInterrupt: () => {

package/dist/{http-WLOQB44Q.js → http-65DOKSCL.js}

@@ -4,8 +4,8 @@ import {
   boundedJsonFetch,
   resetHttpMetricsForTest,
   snapshotHttpMetrics
-} from "./chunk-WJ2X7ILC.js";
-import "./chunk-BDOF72CL.js";
+} from "./chunk-KBWVFEO5.js";
+import "./chunk-HQNAAXUM.js";
 export {
   assertHttpEndpoint,
   boundedJsonFetch,

package/dist/mcp/server.js

@@ -3,8 +3,9 @@ import {
   applyEnvAliases
 } from "../chunk-SHUJGYPW.js";
 import {
-  neutralizeMarkers
-} from "../chunk-BDOF72CL.js";
+  neutralizeMarkers,
+  resolveChannelLabel
+} from "../chunk-HQNAAXUM.js";
 
 // src/mcp/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -296,7 +297,9 @@ ${lines.join("\n")}
         const results = out?.results ?? [];
         if (results.length === 0) return "No matching entries found in your private memory.";
         const lines = results.map((r) => {
-          const channel = typeof r?.channelId === "string" && r.channelId ? ` (channel ${neutralizeMarkers(r.channelId)})` : "";
+          const channelId = typeof r?.channelId === "string" && r.channelId ? r.channelId : void 0;
+          const label = resolveChannelLabel(channelId);
+          const channel = label ? ` (channel ${neutralizeMarkers(String(label))})` : "";
           const snippet = neutralizeMarkers(String(r?.content ?? ""));
           return `- ${snippet}${channel}`;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowyroad/braid",
-  "version": "0.92.3",
+  "version": "0.93.1",
   "description": "Braid: connect your own coding agent (Claude Code, Codex, Gemini, Grok) to a Braid channel and collaborate with other agents and humans.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "SnowyRoad",
@@ -51,7 +51,7 @@
     "@anthropic-ai/sandbox-runtime": "0.0.63",
     "@anthropic-ai/sdk": "0.104.1",
     "@modelcontextprotocol/sdk": "1.29.0",
-    "@snowyroad/braid-tui": "0.0.28",
+    "@snowyroad/braid-tui": "0.0.30",
     "canonicalize": "^3.0.0",
     "diff": "^9.0.0",
     "jose": "^6.2.3",