@monster-orange/den 0.4.3 → 0.4.4

package/src/ui/cli/agents-command.ts

@@ -24,8 +24,10 @@
  *           running: a new session, in the same cwd, continuing the last run;
  *           when that session was never prompted, a fresh start under the
  *           same conversation id (there is nothing to continue).
- *   doctor  (AG-0.3) each runtime: its status, the CLI it runs and where
- *           that came from (setting, login-shell, PATH, well-known), its
+ *   doctor  (AG-0.3, AG-0.5) each runtime of the catalog, installed
+ *           first: its status, the CLI it runs and where that came from
+ *           (workspace or user.yml setting, login shell, PATH, install
+ *           directory, interactive shell), its
  *           version (its version command, once, under a timeout), the
  *           directories searched (names only, never an env value), and the
  *           fix when it is missing. Exit 1 when the default runtime is
@@ -88,16 +90,20 @@ export const AGENTS_HELP = {
     "    a session never prompted starts fresh under the same conversation id",
     "{cli} agents personas [--json]",
     "    Den's default pack, then agents.persona_packs (a later pack wins by id)",
-    "{cli} agents doctor [--json]",
-    "    each runtime: status, the CLI it runs and where it came from, its version,",
-    "    the directories searched, and the fix; exit 1 when the default is missing",
+    "{cli} agents doctor [-w <ws>] [--json]",
+    "    each runtime, installed first: status, the CLI it runs and where it came",
+    "    from, its version, the directories searched, and the fix; exit 1 when the",
+    "    default is missing. -w: as that workspace's agents find them",
     "",
-    "Runtimes: den-claude (default; Claude Code's claude) and generic (the",
-    "persona's argv template). Attach with `{cli} sessions attach <ws>:<id>`.",
-    "A runtime's CLI is found as your terminal finds it: agents.runtimes.<id>.bin",
-    "in config/local/user.yml (an absolute path) wins, then the login shell's PATH,",
-    "this PATH, and its install directories (~/.local/bin, ~/.claude/local,",
-    "/opt/homebrew/bin, /usr/local/bin, npm's global bin).",
+    "Runtimes: den-claude (default; Claude Code's claude), codex (OpenAI's Codex",
+    "CLI), gemini (Google's Gemini CLI), grok (xAI's Grok Build), and generic (the",
+    "persona's argv template). codex, gemini and grok run as their own CLI in the",
+    "workspace, without Den's tools yet. Attach with `{cli} sessions attach <ws>:<id>`.",
+    "A runtime's CLI is found as your terminal finds it: <ws>.agents.runtimes.<id>.bin",
+    "in config/local/workspaces.yml, then agents.runtimes.<id>.bin in",
+    "config/local/user.yml (absolute paths), then the login shell's PATH, this PATH,",
+    "its install directories (~/.local/bin, /opt/homebrew/bin, /usr/local/bin, npm's",
+    "global bin, the vendor's own), and last the interactive shell's PATH.",
     "An agent's env is PATH, HOME, USER, LOGNAME, SHELL, TERM, COLORTERM, LANG,",
     "LC_*, TZ and TMPDIR, plus what its runtime declares: nothing else of yours.",
   ],
@@ -273,10 +279,12 @@ export interface AgentsDoctorDeps {
 }
 
 const SOURCE_WORD: Record<string, string> = {
+  workspace: "the workspace's agents.runtimes setting",
   setting: "agents.runtimes setting",
   "login-shell": "login shell PATH",
   PATH: "PATH",
   "well-known": "install directory",
+  "interactive-shell": "interactive shell PATH",
 };
 
 /** `agents doctor`'s lines for one runtime (names and paths, never env values). */
@@ -284,9 +292,11 @@ export function doctorLines(
   r: RuntimeChoice,
   cli: string,
   userConfig: string,
+  /** Directory lists already printed (a repeat is counted, not listed). */
+  printed: string[] = [],
 ): string[] {
   const lines = [
-    `${r.id}${r.label ? ` (${r.label})` : ""}${r.default ? "  [default]" : ""}`,
+    `${r.id}${r.label ? ` (${r.label}${r.vendor ? `, ${r.vendor}` : ""})` : ""}${r.default ? "  [default]" : ""}${r.denTools === false ? "  [Den tools: coming]" : ""}`,
     r.available
       ? "  status    ✓ available"
       : `  status    ✗ unavailable: ${r.why ?? "unknown"}`,
@@ -298,11 +308,19 @@ export function doctorLines(
   if (r.available && r.setting)
     lines.push(`  version   ${r.version ?? "unknown"}`);
   if (!r.setting) lines.push("  path      none to find (the persona's argv)");
-  else if (r.searched?.length)
-    r.searched.forEach((dir, i) =>
-      lines.push(`  ${i === 0 ? "searched  " : "          "}${dir}`),
-    );
-  else if (r.source !== "setting") lines.push("  searched  (no directories)");
+  else if (r.searched?.length) {
+    const key = r.searched.join("\0");
+    if (printed.includes(key))
+      lines.push(
+        `  searched  the same ${r.searched.length} ${r.searched.length === 1 ? "directory" : "directories"} as above`,
+      );
+    else {
+      printed.push(key);
+      r.searched.forEach((dir, i) =>
+        lines.push(`  ${i === 0 ? "searched  " : "          "}${dir}`),
+      );
+    }
+  } else if (r.source !== "setting") lines.push("  searched  (no directories)");
   if (!r.available && r.setting)
     lines.push(
       `  fix       install ${r.label ?? r.id}, or set ${r.setting} to its absolute path in ${userConfig}`,
@@ -317,25 +335,34 @@ async function doctor(
   deps: AgentsDoctorDeps,
 ): Promise<number> {
   const where = "agents doctor";
-  const p = parseArgs(where, args, { "--json": false });
+  const p = parseArgs(where, args, { "--workspace": true, "--json": false });
   noExtra(where, p);
+  const ws = workspaceFlag(where, p);
+  if (ws && !d.workspaceExists(ws))
+    throw new UsageError(`${where}: workspace "${ws}" does not exist`);
   await (deps.loginPath ?? (() => initLoginPath({ env: d.env })))();
-  const rts = await listRuntimes(d);
+  const rts = await listRuntimes(d, ws);
   const def = rts.find((r) => r.default);
   const code = def?.available ? 0 : 1;
   if (p.flags["--json"]) {
     d.out(
       JSON.stringify(
-        { runtimes: rts, userConfig: d.userConfigFile() },
+        {
+          runtimes: rts,
+          ...(ws ? { workspace: ws } : {}),
+          userConfig: d.userConfigFile(),
+        },
         null,
         2,
       ),
     );
     return code;
   }
+  const printed: string[] = [];
   rts.forEach((r, i) => {
     if (i) d.out("");
-    for (const l of doctorLines(r, d.cli, d.userConfigFile())) d.out(l);
+    for (const l of doctorLines(r, d.cli, d.userConfigFile(), printed))
+      d.out(l);
   });
   d.out("");
   d.out(
@@ -369,6 +396,8 @@ export async function cmdAgents(
         case "personas":
           return await listPersonas(rest, d);
         case "doctor":
+          // -w checks the workspace exists, and reads its runtime paths.
+          await loadAgentWorkspaces(deps);
           return await doctor(rest, d, deps);
         default:
           throw new UsageError(`unknown agents command "${sub}"`);

package/src/ui/cli/edge-command.ts

@@ -25,7 +25,11 @@ import {
   routerUrls,
   type IncludedRouter,
 } from "../../shared/edge/included.js";
-import { edgeRoutes, edgeStatus } from "../../shared/edge/status.js";
+import {
+  edgeRoutes,
+  edgeStatus,
+  withHttpsServing,
+} from "../../shared/edge/status.js";
 import { tlsYaml } from "../../shared/edge/tls.js";
 import { rejoinRunningStacks } from "../../shared/stacks/status.js";
 
@@ -102,7 +106,7 @@ export async function cmdEdge(args: string[]): Promise<void> {
       return;
     }
     case "status": {
-      const st = edgeStatus(cfg);
+      const st = await withHttpsServing(edgeStatus(cfg), cfg);
       console.log(chalk.bold(`${readBrand().name} edge — ${st.org}`));
       console.log(`  container  ${st.container}: ${st.state}`);
       console.log(`  ports      ${published}`);
@@ -116,7 +120,16 @@ export async function cmdEdge(args: string[]): Promise<void> {
           // browser trust (BOOT-1), so this machine's trust is moot.
           `  CA         ${caDir(cfg)} — ${!st.ports ? "not needed: fronted" : st.caTrusted === null ? "unknown" : st.caTrusted ? "trusted" : "NOT trusted"}`,
         );
-      if (st.certIssued) console.log(`  cert       ${st.certNames.join(", ")}`);
+      if (st.certIssuedByDen)
+        console.log(`  cert       ${st.certNames.join(", ")}`);
+      else if (st.https.certs === "distribution")
+        console.log(
+          "  cert       the distribution's (tls: files): not minted by Den",
+        );
+      // MCP-2.5: whether HTTPS is actually serving, not only configured.
+      console.log(
+        `  https      ${st.https.serving === null ? "not probed" : st.https.serving ? "serving" : "NOT serving"} — ${st.https.detail}`,
+      );
       return;
     }
     default:

package/src/ui/cli/health-display.ts

@@ -77,11 +77,14 @@ export function formatRollupLabel(r: RepoRollup): string {
 
 /**
  * Why, for a repo row: the down services ("mailpit down"), and how many
- * services aren't checked ("25 not checked"). Unchecked never means down.
+ * services aren't checked ("25 not checked"), and how many answered with a
+ * redirect ("1 redirect": answering, so neither down nor unchecked).
+ * Unchecked never means down.
  */
 export function rollupReasonText(r: RepoRollup): string {
   return [
     r.down.length ? `${r.down.join(", ")} down` : "",
+    r.redirected ? `${r.redirected} redirect` : "",
     r.unchecked ? `${r.unchecked} not checked` : "",
   ]
     .filter(Boolean)

package/src/ui/mcp/scope.ts

@@ -191,6 +191,20 @@ function grantsNote(scope: McpScope): string {
     : "no grants";
 }
 
+/**
+ * How a person gives `scope`'s agent a grant to `other` (MCP-2.3, AG spec
+ * §5b): config in git, then a restart. An agent never grants itself one.
+ */
+export function grantHint(scope: McpScope, other: string): string {
+  const id = scope.actor.slice("agent:".length);
+  return (
+    `To reach it, a person adds "${printable(other)}" to agents.${id}.grants ` +
+    `in the org config and restarts the agent (agents start passes --grant); ` +
+    "an agent can't grant itself one. For names and status counts of every " +
+    "workspace, call org_summary."
+  );
+}
+
 /** The refusal for a call that names `other`; it names the agent's grants. */
 export function otherWorkspace(
   tool: string,
@@ -199,7 +213,8 @@ export function otherWorkspace(
 ): ScopeRefusal {
   return new ScopeRefusal(
     `${tool}: this MCP server is scoped to workspace "${scope.workspace}" ` +
-      `(${scope.actor}; ${grantsNote(scope)}); "${printable(other)}" is another workspace, so nothing was read or run.`,
+      `(${scope.actor}; ${grantsNote(scope)}); "${printable(other)}" is another workspace, so nothing was read or run. ` +
+      grantHint(scope, other),
   );
 }
 
@@ -299,8 +314,10 @@ function focusedOf(body: unknown): string | null {
 export async function assertScopeExists(
   api: DenApi,
   scope: McpScope,
+  /** An /api/workspaces body already read (else it is read now). */
+  read?: unknown,
 ): Promise<unknown> {
-  const body = await api.get("/api/workspaces");
+  const body = read ?? (await api.get("/api/workspaces"));
   if (!(scope.workspace in asRecord(asRecord(body).workspaces)))
     throw new ScopeRefusal(
       `this MCP server is scoped to workspace "${scope.workspace}", which does not exist in this distribution.`,
@@ -375,7 +392,10 @@ export async function assertServicesInScope(
   if (outside.length)
     throw new ScopeRefusal(
       `${tool}: ${outside.map(printable).join(", ")} ${outside.length === 1 ? "is" : "are"} not a service ` +
-        `of workspace "${scope.workspace}", the only one this MCP server serves; nothing was read.`,
+        `of workspace "${scope.workspace}", the only one this MCP server serves; nothing was read. ` +
+        "Logs and service details stay inside each workspace (logs can hold " +
+        "secrets), and a grant does not widen them; org_summary has every " +
+        "workspace's status counts.",
     );
 }
 

package/src/ui/mcp/server.ts

@@ -49,7 +49,9 @@ export function createDenMcpServer(opts: DenMcpOptions): McpServer {
   const p = product();
   const session = opts.session ?? randomUUID();
   const log = opts.log ?? ((l: string) => process.stderr.write(`${l}\n`));
-  const tools = toolsFor(opts.cfg);
+  // Scoped, each workspace tool is registered pinned (MCP-2.2): "this
+  // workspace only", and no workspace parameter unless there are grants.
+  const tools = toolsFor(opts.cfg, opts.scope);
   const server = new McpServer(
     { name: p.name, version: engineVersion() ?? "0.0.0" },
     {
@@ -61,8 +63,11 @@ export function createDenMcpServer(opts: DenMcpOptions): McpServer {
           : "Read-only: the org has enabled no actions (mcp.actions).") +
         (opts.scope
           ? ` Scoped to workspace "${opts.scope.workspace}" as ${opts.scope.actor}: ` +
-            "a call naming another workspace is refused, and lists show this one only."
-          : ""),
+            "a call naming another workspace is refused, and lists show this one only, " +
+            "each with a `scope` block saying how much is hidden. org_summary has " +
+            "every workspace and repo (names and status counts), the graph, the " +
+            "edge and the environments: start there for the whole picture."
+          : " org_summary has the whole org at a glance: start there."),
     },
   );
 
@@ -222,8 +227,10 @@ export async function runOneShot(
   opts: OneShotOptions,
 ): Promise<number> {
   const out = opts.out ?? ((t: string) => process.stdout.write(t));
+  // The tools exactly as the stdio server registers them: pinned when scoped.
+  const tools = toolsFor(opts.cfg, opts.scope);
   if (shot.kind === "list") {
-    const names = toolsFor(opts.cfg).map((t) => t.name);
+    const names = tools.map((t) => t.name);
     out(names.length ? `${names.join("\n")}\n` : "");
     return 0;
   }
@@ -235,11 +242,18 @@ export async function runOneShot(
   };
   // The stdio server validates arguments against each tool's schema (the
   // SDK does it); a one-shot must too, and strictly: it is typed by hand, so
-  // an unknown or misspelt key is an error, not silently dropped.
+  // an unknown or misspelt key is an error, not silently dropped. Scoped,
+  // the schema is the pinned one; a `workspace` it dropped (no grants) is
+  // still taken, so naming another workspace gets Den's refusal (callTool),
+  // never a silent answer about the scope's own.
   let args = shot.args;
-  const tool = toolsFor(opts.cfg).find((t) => t.name === shot.tool);
+  const tool = tools.find((t) => t.name === shot.tool);
   if (tool) {
-    const parsed = z.object(tool.shape).strict().safeParse(args);
+    const shape =
+      opts.scope && !("workspace" in tool.shape) && "workspace" in args
+        ? { ...tool.shape, workspace: z.string().optional() }
+        : tool.shape;
+    const parsed = z.object(shape).strict().safeParse(args);
     if (!parsed.success) {
       const err = opts.err ?? ((t: string) => process.stderr.write(t));
       const lines = parsed.error.issues.map((i) => {
@@ -384,6 +398,16 @@ export async function runMcp(rawArgv: string[]): Promise<void> {
           ...scopeInfo(scope ?? undefined),
         }),
     });
+    // Say the scope on stderr (stdout is the result): a one-shot that ran
+    // unscoped must never pass for a scoped one.
+    if (scope)
+      process.stderr.write(
+        `${cli} mcp --call: scoped to ${scope.workspace} as ${scope.actor}` +
+          (scope.grants?.length
+            ? ` · grants: ${scope.grants.join(", ")}`
+            : "") +
+          "\n",
+      );
     process.exitCode = await runOneShot(shot, {
       cfg,
       cli,