@monster-orange/den 0.4.17 → 0.4.19

package/src/ui/cli/agent-ops.ts

@@ -78,6 +78,7 @@ import { envKey } from "../../shared/product.js";
 import { redactSecrets } from "../../shared/redact.js";
 import {
   loadPersonas,
+  serverPersona,
   resolvePackDirs,
   type Persona,
 } from "../../shared/agents/personas.js";
@@ -167,6 +168,11 @@ import {
   type BinSource,
 } from "../../shared/agents/runtime-search.js";
 import { WORKSPACE_NAME_RE } from "../../shared/agent-actor.js";
+import {
+  SERVER_PERSONA_ID,
+  isServerScope,
+  serverAgentDir,
+} from "../../shared/agents/server-agent.js";
 import {
   bindActorSession,
   mintActorToken,
@@ -333,7 +339,7 @@ function defaultMcpServer(cli: string): {
 
 export function resolveAgentsDeps(d: AgentsDeps): AgentsResolved {
   const base = resolveDeps(d);
-  return {
+  return withServerScope({
     ...base,
     agentsConfig: d.agentsConfig ?? (() => readAgentsConfig()),
     distRoot: d.distRoot ?? getDistRoot,
@@ -365,6 +371,26 @@ export function resolveAgentsDeps(d: AgentsDeps): AgentsResolved {
           ? setWorkspaceRuntimeBin(ws, id, bin)
           : setUserRuntimeBin(id, bin)),
     userConfigFile: d.userConfigFile ?? userConfigPath,
+  });
+}
+
+/**
+ * ON-6: the server agent's scope is no workspace, but its agent is a
+ * normal one: it "exists", and its folder is an empty one under the state
+ * dir (serverAgentDir), with no workspace runtime paths.
+ */
+function withServerScope(r: AgentsResolved): AgentsResolved {
+  return {
+    ...r,
+    workspaceExists: (ws) => isServerScope(ws) || r.workspaceExists(ws),
+    workspaceDir: (ws) =>
+      isServerScope(ws) ? serverAgentDir(r.stateDir()) : r.workspaceDir(ws),
+    workspaceFolders: (ws) =>
+      isServerScope(ws)
+        ? { under: [serverAgentDir(r.stateDir())] }
+        : r.workspaceFolders(ws),
+    workspaceRuntimeBin: (ws, id) =>
+      isServerScope(ws) ? undefined : r.workspaceRuntimeBin(ws, id),
   };
 }
 
@@ -685,14 +711,18 @@ function agentsConfig(d: AgentsResolved): ResolvedAgentsConfig {
 function personas(
   d: AgentsResolved,
   cfg: ResolvedAgentsConfig,
+  /** ON-6: the server scope adds Den's own server persona (only there). */
+  ws?: string,
 ): Map<string, Persona> {
   try {
-    return loadPersonas(
+    const all = loadPersonas(
       resolvePackDirs(cfg.personaPacks, d.distRoot()),
       undefined,
       { defaultPack: cfg.defaultPackGuardrails, packs: cfg.packGuardrails },
       localPersonasDir(d.stateDir()),
     );
+    if (isServerScope(ws)) all.set(SERVER_PERSONA_ID, serverPersona());
+    return all;
   } catch (e) {
     throw refused((e as Error).message, [], 422);
   }
@@ -1337,6 +1367,9 @@ function launchInput(
     rotateAfter: after,
     ...(perms.permission ? { permission: perms.permission } : {}),
     ...(perms.allow?.length ? { allow: [...perms.allow] } : {}),
+    // ON-6: the server agent runs Den's own tools without the runtime's
+    // prompt; its writes wait for the person's Allow in the browser.
+    ...(isServerScope(ws) ? { denToolsAllowed: true } : {}),
   };
 }
 
@@ -1409,6 +1442,12 @@ export interface StartRequest {
   allow?: unknown;
   /** AG-10.10: a display name for this agent (AG-4b's), to tell two apart. */
   name?: unknown;
+  /**
+   * 0.4.18, Start agent here: the folder it runs in, the workspace's own
+   * or one inside it (a repo's), relative to the workspace's folder or
+   * absolute. Default: the workspace's folder.
+   */
+  folder?: string;
   /**
    * The page's start (AG-10.1): a model must be one the runtime offers,
    * never a free string (the CLI's --model for generic stays free).
@@ -1524,6 +1563,39 @@ interface StartMore {
   bringIn?: { token: string; cwd: string };
 }
 
+/**
+ * 0.4.18: the folder a start runs in. Relative to the workspace's folder,
+ * or absolute; it must be a directory inside the workspace's scope (its
+ * folder, or a by-path repo's), never outside it.
+ */
+export function startFolder(
+  d: AgentsResolved,
+  ws: string,
+  folder: string,
+): string {
+  const where = "agents start";
+  if (typeof folder !== "string" || !folder.trim() || folder.length > 4096)
+    throw usage(`${where}: folder must be a path`);
+  const dir = path.resolve(d.workspaceDir(ws), folder.trim());
+  let real: string;
+  try {
+    real = fs.realpathSync(dir);
+  } catch {
+    throw usage(`${where}: folder ${dir} does not exist`, 404);
+  }
+  if (!fs.statSync(real).isDirectory())
+    throw usage(`${where}: folder ${dir} is not a directory`);
+  // The real folder only: a link inside the workspace that points out of
+  // it is outside it (the scope's own folders are compared real, too).
+  if (!inScope(real, d.workspaceFolders(ws)))
+    throw refused(
+      `${where}: folder ${dir} is not inside workspace ${ws}`,
+      [],
+      403,
+    );
+  return real;
+}
+
 export async function startAgent(
   d: AgentsResolved,
   req: StartRequest,
@@ -1534,7 +1606,7 @@ export async function startAgent(
   if (!d.workspaceExists(ws))
     throw usage(`${where}: workspace "${ws}" does not exist`, 404);
   const cfg = agentsConfig(d);
-  const all = personas(d, cfg);
+  const all = personas(d, cfg, ws);
   const persona = all.get(req.persona);
   if (!persona)
     throw usage(
@@ -1571,6 +1643,10 @@ export async function startAgent(
       ...(rt.permissions ? { allow } : {}),
     }),
     ...(more.firstPrompt ? { firstPrompt: more.firstPrompt } : {}),
+    // 0.4.18: Start agent here: in a folder of the workspace's.
+    ...(req.folder !== undefined && !more.bringIn
+      ? { worktree: startFolder(d, ws, req.folder) }
+      : {}),
     // AG-17.1: the runtime's resume, in the folder the conversation ran in.
     ...(more.bringIn
       ? { worktree: more.bringIn.cwd, resumeToken: more.bringIn.token }
@@ -2065,7 +2141,7 @@ export async function resumeAgent(
     );
   const cfg = agentsConfig(d);
   const grants = resumeGrants(rec, cfg);
-  const persona = personas(d, cfg).get(rec.persona);
+  const persona = personas(d, cfg, rec.workspace).get(rec.persona);
   if (!persona)
     throw refused(`agent ${rec.id}'s persona "${rec.persona}" is gone`);
   const det = await availableOrRefuse(d, rt, rec.workspace);
@@ -2269,7 +2345,7 @@ export async function changePersona(
   const where = "agents persona";
   const rec = agentRecord(d, id, ws);
   const cfg = agentsConfig(d);
-  const all = personas(d, cfg);
+  const all = personas(d, cfg, rec.workspace);
   if (!all.get(req.persona))
     throw usage(
       `${where}: no persona "${req.persona}" (personas: ${[...all.keys()].sort().join(", ")})`,
@@ -2704,7 +2780,9 @@ export async function markInterrupted(
     return found;
   }
   for (const rec of marked) {
-    const p = all.get(rec.persona);
+    const p = isServerScope(rec.workspace)
+      ? serverPersona()
+      : all.get(rec.persona);
     if (!p || !(p.standing || p.resumeOnRestart)) continue;
     if (resumeRefusal(rec)) continue;
     try {

package/src/ui/cli/create.ts

@@ -545,7 +545,7 @@ export async function createResult(
       return {
         ok: false,
         error,
-        fix: `npx ${ENGINE_PACKAGE} create ${args.name} ${path.join(path.dirname(args.dir), `${args.name}-den`)} --yes --json`,
+        fix: `npx ${ENGINE_PACKAGE}@latest create ${args.name} ${path.join(path.dirname(args.dir), `${args.name}-den`)} --yes --json`,
         ask: `${args.dir} already has files that are not a ${args.name} distribution. Which new or empty folder should the distribution go in?`,
       };
     return {
@@ -576,7 +576,7 @@ export async function runCreate(
         JSON.stringify({
           ok: false,
           error: (e as Error).message.split("\n")[0],
-          fix: `npx ${ENGINE_PACKAGE} create <name> [dir] --yes --json`,
+          fix: `npx ${ENGINE_PACKAGE}@latest create <name> [dir] --yes --json`,
         } satisfies CreateJson),
       );
     } else console.error(`create: ${(e as Error).message}`);

package/src/ui/cli/index.ts

@@ -446,7 +446,7 @@ const COMMAND_HELP: Record<string, { usage: string; lines: string[] }> = {
       "create <name> [dir] [--title <title>] [--cli <cli>] [--env-prefix <PREFIX>]",
     lines: [
       "Scaffold a new distribution (den.yml, config, bin shim, Makefile) in [dir].",
-      "Also: npx @monster-orange/den create <name>. See docs/distributions.md.",
+      "Also: npx @monster-orange/den@latest create <name>. See docs/distributions.md.",
     ],
   },
   validate: {

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

@@ -60,6 +60,7 @@ import { ensureManagedServiceClone } from "../../shared/environment-manager/work
 import { getGitHubCoords } from "../../shared/smoke/git-remote.js";
 import {
   detectRunCommands,
+  draftHealthUrl,
   repoNameFrom,
   sidecarManifest,
   type DetectedCommands,
@@ -358,7 +359,13 @@ export function repoAdd(
           error: `cannot name a repo from the folder "${key}"`,
           fix: `${bin} repo add ${a.spec} --name <repo> --json`,
         };
-      const manifest = sidecarManifest(mName, d.commands, a.health);
+      // No --health: the dev server's own port, when its script names one,
+      // so the drafted service has a health check and a Visit link.
+      const manifest = sidecarManifest(
+        mName,
+        d.commands,
+        a.health ?? draftHealthUrl(repoPath, d.commands),
+      );
       const v = validate(manifest);
       const dry = a.dryRun
         ? {

package/src/ui/cli/repo-detect.ts

@@ -157,6 +157,64 @@ export function needsDocker(manifest: unknown, repoPath?: string): boolean {
   return repoPath ? composeFileOf(repoPath) !== undefined : false;
 }
 
+/**
+ * Dev servers' own default ports, by the command a package script runs.
+ * Only tools whose default is fixed and documented; anything else gets no
+ * port, and so no health URL.
+ */
+const DEV_SERVER_PORTS: ReadonlyArray<[RegExp, number]> = [
+  [/^next(\s+dev)?\b/, 3000],
+  [/^(vite|vite\s+dev|vite\s+serve)\b/, 5173],
+  [/^(nuxt|nuxi)\s+dev\b/, 3000],
+  [/^react-scripts\s+start\b/, 3000],
+  [/^ng\s+serve\b/, 4200],
+  [/^gatsby\s+develop\b/, 8000],
+  [/^remix\s+vite:dev\b/, 5173],
+  [/^webpack(-dev-server|\s+serve)\b/, 8080],
+];
+
+/** A port the command names itself: --port N, -p N, PORT=N. */
+function explicitPort(cmd: string): number | undefined {
+  const m =
+    /(?:^|\s)--port[=\s]+(\d{2,5})\b/.exec(cmd) ??
+    /(?:^|\s)-p\s+(\d{2,5})\b/.exec(cmd) ??
+    /(?:^|\s)PORT=(\d{2,5})\b/.exec(cmd);
+  const n = m ? Number(m[1]) : NaN;
+  return n > 0 && n < 65536 ? n : undefined;
+}
+
+/**
+ * The port a repo's dev server listens on, when its start command is a
+ * package script that names one or runs a dev server with a known default.
+ * Read-only: the script's text, never the running server.
+ */
+export function detectDevPort(
+  repoPath: string,
+  c: Pick<DetectedCommands, "up">,
+): number | undefined {
+  const scripts = readScripts(repoPath);
+  const m = /^npm\s+(?:run\s+(\S+)|(start))$/.exec(c.up.trim());
+  const script = m ? scripts[m[1] ?? "start"] : c.up;
+  if (!script) return undefined;
+  const own = explicitPort(script);
+  if (own) return own;
+  // The tool the script runs, after any VAR=value prefixes and npx.
+  const tool = script
+    .trim()
+    .replace(/^(?:[A-Z_][A-Z0-9_]*=\S*\s+)+/, "")
+    .replace(/^npx\s+(?:--yes\s+)?/, "");
+  return DEV_SERVER_PORTS.find(([re]) => re.test(tool))?.[1];
+}
+
+/** The health URL to draft: the dev server's own port, at `/`. */
+export function draftHealthUrl(
+  repoPath: string,
+  c: Pick<DetectedCommands, "up">,
+): string | undefined {
+  const port = detectDevPort(repoPath, c);
+  return port ? `http://localhost:${port}/` : undefined;
+}
+
 /** The side-car manifest for a repo Den detected. Validate before writing. */
 export function sidecarManifest(
   name: string,