@monster-orange/den 0.4.13 → 0.4.15

package/src/ui/server/route-classes.ts

@@ -95,7 +95,8 @@ export const ROUTES: readonly RouteEntry[] = [
     "/theme-favicon",
     "/theme-favicon/*",
     "/vendor/*",
-    "/report*",
+    "/report",
+    "/report/*",
     "/reports/security/*",
   ].map((p) => R(p)),
   R("/_den/throw", "a test-only route (DEN_DEBUG_ROUTES): it throws"),
@@ -159,6 +160,10 @@ export const ROUTES: readonly RouteEntry[] = [
     "/api/personas/:id",
     "edits or deletes a person's own persona (AG-10.7); never an agent's token",
   ),
+  R(
+    "/api/workspaces/:ws/conversations",
+    "lists a runtime's own conversations in the workspace's folder: titles only, the ends of each file (AG-17.1)",
+  ),
   R(
     "/api/workspaces/:ws/agents/:id/paths",
     "which paths an agent printed exist in its workspace (stat only, AG-4b)",
@@ -170,6 +175,30 @@ export const ROUTES: readonly RouteEntry[] = [
   R("/api/health", "runs the manifests' health probes: read-only checks"),
   R("/api/test-sources", "git rev-parse in each repo: read-only"),
   R("/api/manifest/validate", "GET validates a file at a path: read-only"),
+  // ON-3 (onboard-routes.ts): reads only; nothing written, no repo tool run.
+  R("/api/onboard/status", "what's set up and the next step (file reads)"),
+  R(
+    "/api/onboard/repos",
+    "lists the git repos in a folder in home; never follows a symlink",
+  ),
+  R(
+    "/api/onboard/manifest",
+    "drafts and validates a side-car manifest; writes nothing",
+  ),
+  // ON-3's held writes (approval-routes.ts): asking runs nothing; Allow is
+  // the person's signed-in browser only (approvals.ts approverAllowed).
+  R("/api/approvals", "what waits for the person (never an agent's token)"),
+  R("/api/approvals/:id", "one held request: the asker's own, or the person's"),
+  M(
+    ["POST"],
+    "/api/approvals",
+    "holds an agent's write for the person; nothing runs until they allow it",
+  ),
+  M(
+    ["POST"],
+    "/api/approvals/:id/decide",
+    "the person's Allow runs the held write once; Deny runs nothing",
+  ),
   R("/api/service/logs", "reads (and follows) a service's log"),
   R("/api/service/taillog", "tails a service's log (tail, docker logs)"),
   R(
@@ -353,6 +382,11 @@ export const ROUTES: readonly RouteEntry[] = [
     "/api/workspaces/:ws/agents",
     "starts an agent: a runtime in a PTY",
   ),
+  S(
+    ["POST"],
+    "/api/workspaces/:ws/conversations/:id/import",
+    "brings in a conversation: its runtime's resume in a PTY (AG-17.1)",
+  ),
   S(
     ["POST"],
     "/api/workspaces/:ws/sessions",
@@ -438,11 +472,17 @@ export const REGEX_ROUTES: Readonly<Record<string, readonly string[]>> = {
   "agent-routes.ts:RUNTIME_PATH": ["/api/agents/runtimes/:id/path"],
   "agent-routes.ts:PERSONA_PATH": ["/api/personas/:id"],
   "agent-routes.ts:PLAIN_PATH": ["/api/workspaces/:ws/sessions"],
+  "agent-routes.ts:CONVERSATIONS_PATH": [
+    "/api/workspaces/:ws/conversations",
+    "/api/workspaces/:ws/conversations/:id/import",
+  ],
   "session-routes.ts:IO_PATH": ["/api/sessions/:id/io"],
   "github-routes.ts:SIGNIN_PATH": ["/api/github/signin/:id"],
   "github-routes.ts:LINK_PATH": ["/api/web/owner/link/:id"],
   "pair-routes.ts:POLL_PATH": ["/api/signin/code/:id"],
   "index.ts:LOGIN_WAIT_PATH": ["/api/web/logins/:id"],
+  "approval-routes.ts:ONE_PATH": ["/api/approvals/:id"],
+  "approval-routes.ts:DECIDE_PATH": ["/api/approvals/:id/decide"],
 };
 
 /** Whether `pathname` matches a table path. */

package/src/ui/server/session-routes.ts

@@ -9,8 +9,9 @@
  * `<cli> agents list` does (agent-ops.ts agentRows), and adds the plain
  * sessions (`sessions start`), labelled kind "session". An agent whose
  * actor token `web logout --all` revoked is marked (tokenRevoked). The
- * host knows nothing of approvals yet, so `waiting` is never set here
- * (AG-6a adds it). Asking never starts a session host.
+ * agent with one of Den's held writes waiting for the person (ON-3,
+ * approval-routes.ts) is `waiting` (AG-6a); a runtime's own permission
+ * prompts are not seen here yet. Asking never starts a session host.
  *
  * The io route bridges one WebSocket to one attachment on the session host
  * (its own connection to the host, so a browser and the CLI, or two
@@ -78,6 +79,8 @@ export interface SessionRouteDeps {
   /** Whether workspaces.yml names `ws` (active or not). */
   workspaceExists?: (ws: string) => boolean;
   pty?: () => PtyLoad;
+  /** The agent ids with an approval waiting for the person (AG-6a, ON-3). */
+  waitingAgents?: () => ReadonlySet<string>;
 }
 
 interface Resolved {
@@ -87,6 +90,7 @@ interface Resolved {
   activeWorkspaces: () => string[];
   workspaceExists: (ws: string) => boolean;
   pty: () => PtyLoad;
+  waitingAgents: () => ReadonlySet<string>;
 }
 
 /** A workspace name as `?ws=` may give it. */
@@ -116,6 +120,7 @@ function resolve(d: SessionRouteDeps = {}): Resolved {
           ws,
         )),
     pty: d.pty ?? (() => loadPty()),
+    waitingAgents: d.waitingAgents ?? (() => new Set<string>()),
   };
 }
 
@@ -189,7 +194,8 @@ export interface ListedSession {
 /** The list, from the host's sessions and the agent records. */
 export function listedSessions(
   sessions: SessionInfo[],
-  d: Pick<Resolved, "stateDir" | "dist" | "activeWorkspaces">,
+  d: Pick<Resolved, "stateDir" | "dist" | "activeWorkspaces"> &
+    Partial<Pick<Resolved, "waitingAgents">>,
   /** A workspace asked for by name (`?ws=`), listed even when inactive. */
   also?: string,
 ): ListedSession[] {
@@ -204,6 +210,7 @@ export function listedSessions(
     active.has(r.workspace),
   );
   const revoked = revokedAgentIds(d.stateDir());
+  const waiting = d.waitingAgents?.() ?? new Set<string>();
   const out: ListedSession[] = [];
   const agentSessions = new Set<string>();
   noteEnded(d.stateDir(), mine, records);
@@ -242,6 +249,7 @@ export function listedSessions(
       ...(r.interruptedAt ? { interruptedAt: r.interruptedAt } : {}),
       ...(r.rotation?.due ? { rotation: r.rotation } : {}),
       ...(revoked.has(rec.id) && s && !s.exited ? { tokenRevoked: true } : {}),
+      ...(waiting.has(rec.id) && s && !s.exited ? { waiting: true } : {}),
     });
   }
   for (const s of mine) {

package/src/ui/server/workspace-routes.ts

@@ -344,6 +344,25 @@ const availableReposCache = singleFlight<AvailableRepos>(2_000);
  * Same contract as the original inline handlers: uses return sendJson/send400
  * to end the response. Caller checks res.writableEnded to know if handled.
  */
+
+/**
+ * Why a workspace can't be created with this name, or null: the Workspaces
+ * page's create and ON-3's held workspace_create (approval-routes.ts) both
+ * ask this.
+ */
+export function workspaceCreateRefusal(
+  name: string | undefined,
+): string | null {
+  if (!name) return "name required";
+  // eslint-disable-next-line no-control-regex
+  if (/["'\\/<>\x00-\x1f]/.test(name))
+    return "name must not contain quotes, slashes, or control characters";
+  if (name.length > 64) return "name must be 64 characters or fewer";
+  if (readWorkspacesFile().workspaces[name])
+    return `workspace "${name}" already exists`;
+  return null;
+}
+
 export async function handleWorkspaceRoutes(
   req: http.IncomingMessage,
   res: http.ServerResponse,
@@ -639,16 +658,8 @@ export async function handleWorkspaceRoutes(
     try {
       const body = await readBody(req);
       const { name } = JSON.parse(body) as { name?: string };
-      if (!name) return send400(res, "name required");
-      // eslint-disable-next-line no-control-regex
-      if (/["'\\/<>\x00-\x1f]/.test(name))
-        return send400(
-          res,
-          "name must not contain quotes, slashes, or control characters",
-        );
-      const file = readWorkspacesFile();
-      if (file.workspaces[name])
-        return send400(res, `workspace "${name}" already exists`);
+      const refusal = workspaceCreateRefusal(name);
+      if (refusal || !name) return send400(res, refusal ?? "name required");
       createWorkspace(name, { services: {} });
       return sendJson(res, { ok: true, name });
     } catch (e) {

package/themes/den/den-theme.json

@@ -3,7 +3,7 @@
   "schema": "den.theme/v1",
   "id": "den",
   "name": "Den",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Den's default: a sheltered workspace in walnut and umber neutrals with a moss-green accent. System fonts.",
   "author": "Monster Orange",
   "license": "MIT",
@@ -37,13 +37,13 @@
       "border": "#dcd3c7",
       "border-strong": "#8d7f6d",
       "accent": "#557a2a",
-      "accent-text": "#4a6b23",
+      "accent-text": "#415e1f",
       "accent-fill": "#4a6b23",
       "on-accent": "#ffffff",
-      "ok": "#2e7246",
-      "warn": "#8c5a10",
-      "bad": "#b0392a",
-      "remote": "#23677a",
+      "ok": "#27613b",
+      "warn": "#774c0e",
+      "bad": "#983124",
+      "remote": "#205d6e",
       "shadow": "0 8px 24px rgb(48 36 24 / 0.14)",
       "bar": "linear-gradient(90deg, #557a2a 0%, #8a6a48 100%)"
     },