@monster-orange/den 0.4.13 → 0.4.14

package/src/ui/server/public/i18n/ja.js

@@ -439,6 +439,9 @@
     "ag.new.plainP":
       "ワークスペースのフォルダーで開くターミナル。エージェントなし。",
     "ag.new.task": "最初の指示（任意）",
+    "ag.new.name": "名前（任意）",
+    "ag.new.as": "{id} として開始します",
+    "ag.new.openRunning": "実行中のものを開く",
     "ag.new.taskPh":
       "例: 空の状態のストーリーを担当。デザインに合わせ、テストを追加する。",
     "ag.new.adv": "詳細設定: モデルと権限",
@@ -448,6 +451,27 @@
     "ag.new.modelDef": "ペルソナの既定（{m}）",
     "ag.new.ver": "バージョン",
     "ag.new.verDef": "ペルソナの既定（{v}）",
+    // AG-17.1, Bring in.
+    "ag.bring": "取り込む",
+    "ag.bring.title": "会話を取り込む",
+    "ag.bring.conv": "会話",
+    "ag.bring.help":
+      "このワークスペースのフォルダーまたはそのリポジトリのフォルダーで、Den の外で始めた会話です。新しい順に並びます。",
+    "ag.bring.none":
+      "このワークスペースのフォルダーやそのリポジトリのフォルダーに、Den の外で始めた会話はありません。",
+    "ag.bring.untitled": "無題の会話",
+    "ag.bring.open": "別の場所で開いています",
+    "ag.bring.openTip":
+      "まだ別のターミナルで開いています。先にそちらで閉じてください",
+    "ag.bring.agent": "エージェント {id}",
+    "ag.bring.note":
+      "実行していたフォルダーで続けます。ここからは Den のツールとガードが適用されます。ペインを閉じても実行は続きます。先にほかのターミナルで閉じてください。Den が開いていると判断できるのは、直近 1 分以内に書き込まれた会話だけです。",
+    "ag.bring.go": "取り込む",
+    "ag.bring.going": "取り込み中…",
+    "ag.bring.done": "{id} として取り込みました",
+    "ag.bring.now": "たった今",
+    "ag.bring.min": "{n} 分前",
+    "ag.bring.h": "{n} 時間前",
     "ag.new.note":
       "ワークスペースのフォルダーで開始します。ペインを閉じても実行は続きます。",
     "ag.new.started": "{w} で {p} を開始しました",

package/src/ui/server/public/persona-ui.css

@@ -315,6 +315,20 @@ dialog.pe-dlg::backdrop {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+/* Bring in: the title is cut, never its badge ("Agent reviewer"). */
+.pr .pn.pnc {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.pr .pnc .pt {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.pr .pnc .tagx {
+  flex: none;
+}
 .pr .pn .role,
 .prow .pn .role {
   color: var(--faint);
@@ -537,3 +551,13 @@ dialog.pe-dlg::backdrop {
   padding: 2px 9px;
   font-size: 12.5px;
 }
+
+/* AG-17.1, Bring in: a conversation that can't be picked (open elsewhere,
+   or an agent already continues it). */
+.pr[aria-disabled="true"] {
+  opacity: 0.6;
+  cursor: default;
+}
+.pr[aria-disabled="true"]:hover {
+  background: none;
+}

package/src/ui/server/public/shell.js

@@ -566,6 +566,9 @@
     "ag.new.plain": "Plain session",
     "ag.new.plainP": "A terminal in the workspace folder. No agent.",
     "ag.new.task": "First instruction (optional)",
+    "ag.new.name": "Name (optional)",
+    "ag.new.as": "Starts as {id}",
+    "ag.new.openRunning": "Open the running one",
     "ag.new.taskPh":
       "e.g. Take the empty-state story. Match the design and add a test.",
     "ag.new.adv": "Advanced: model and permissions",
@@ -575,6 +578,26 @@
     "ag.new.modelDef": "Persona default ({m})",
     "ag.new.ver": "Version",
     "ag.new.verDef": "Persona default ({v})",
+    // AG-17.1, Bring in.
+    "ag.bring": "Bring in",
+    "ag.bring.title": "Bring in a conversation",
+    "ag.bring.conv": "Conversation",
+    "ag.bring.help":
+      "Conversations started outside Den in this workspace's folder or its repos' folders, newest first.",
+    "ag.bring.none":
+      "No conversations started outside Den in this workspace's folder or its repos' folders.",
+    "ag.bring.untitled": "Untitled conversation",
+    "ag.bring.open": "Open elsewhere",
+    "ag.bring.openTip": "Still open in another terminal. Close it there first",
+    "ag.bring.agent": "Agent {id}",
+    "ag.bring.note":
+      "Continues it in the folder it ran in, with Den's tools and guards from now on. It keeps running if you close the pane. Close it in any other terminal first: Den only sees a conversation as open if it was written in the last minute.",
+    "ag.bring.go": "Bring in",
+    "ag.bring.going": "Bringing in…",
+    "ag.bring.done": "Brought in as {id}",
+    "ag.bring.now": "just now",
+    "ag.bring.min": "{n} min ago",
+    "ag.bring.h": "{n} h ago",
     "ag.new.note":
       "Starts in the workspace folder. It keeps running if you close the pane.",
     "ag.new.started": "Started {p} in {w}",

package/src/ui/server/request-guard.ts

@@ -17,9 +17,9 @@
  *    and sign-in (/api/web/*, /auth, /api/session/logout), the lock (R8:
  *    /api/sudo-password*), or a shell-grade route other than its own
  *    session's /api/sessions/<id>/*: agent start and resume mint tokens.
- *    403 `agent_forbidden`. One exception (AG-14.4): MCP agent_resume,
- *    when mcp.actions lists it, for another agent of its own workspace
- *    or a granted one (agent-resume-grant.ts). WS-3a (0.4.2) adds the workspace check at
+ *    403 `agent_forbidden`. Two exceptions: MCP agent_resume (AG-14.4)
+ *    and agent_import (AG-17.1), each when mcp.actions lists it, inside
+ *    its own workspace or a granted one (agent-resume-grant.ts). WS-3a (0.4.2) adds the workspace check at
  *    agentRefusal's seam.
  *  - Sign-in (§4, route-classes.ts): beyond loopback (a LAN name, a peer
  *    that isn't loopback, or the edge hostname for a client on another
@@ -61,7 +61,12 @@
 import { randomBytes, timingSafeEqual, createHash } from "crypto";
 import type * as http from "http";
 import { readMcpConfig } from "../../shared/den-config.js";
-import { agentResumeRefusal, agentResumeTarget } from "./agent-resume-grant.js";
+import {
+  agentImportRefusal,
+  agentImportTarget,
+  agentResumeRefusal,
+  agentResumeTarget,
+} from "./agent-resume-grant.js";
 import * as net from "net";
 import * as os from "os";
 import {
@@ -718,6 +723,14 @@ export function agentRefusal(
       agentResumeRefusal(p, target.ws, target.id, mcpActions()) ??
       workspaceRefusal(p, pathname)
     );
+  // AG-17.1: MCP agent_import, opted in, inside the agent's scope (its
+  // list as well as its import: conversation titles are a person's).
+  const imp = agentImportTarget(pathname);
+  if (imp)
+    return (
+      agentImportRefusal(p, imp.ws, mcpActions()) ??
+      workspaceRefusal(p, pathname)
+    );
   if (cls === "shell-grade")
     return `${p.actor} can't ${method === "GET" ? "open" : "use"} ${pathname}: starting or resuming an agent, and the browser sessions, are a person's.`;
   return workspaceRefusal(p, pathname);

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

@@ -159,6 +159,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)",
@@ -353,6 +357,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,6 +447,10 @@ 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"],