@chorus-aidlc/chorus 0.14.6 → 0.15.0

package/.next/standalone/public/kiro-plugin/.kiro/skills/chorus-develop/SKILL.md

@@ -4,7 +4,7 @@ description: Chorus Development workflow — claim tasks, report work, manage se
 license: AGPL-3.0
 metadata:
   author: chorus
-  version: "0.14.6"
+  version: "0.15.0"
   category: project-management
   mcp_server: chorus
 ---

package/.next/standalone/public/kiro-plugin/.kiro/skills/chorus-idea/SKILL.md

@@ -4,7 +4,7 @@ description: Chorus Idea workflow — claim ideas, run elaboration rounds, and p
 license: AGPL-3.0
 metadata:
   author: chorus
-  version: "0.14.6"
+  version: "0.15.0"
   category: project-management
   mcp_server: chorus
 ---

package/.next/standalone/public/kiro-plugin/.kiro/skills/chorus-openspec-aware/SKILL.md

@@ -4,7 +4,7 @@ description: Opt-in OpenSpec-mode authoring for Chorus PM workflows in Kiro CLI.
 license: AGPL-3.0
 metadata:
   author: chorus
-  version: "0.14.6"
+  version: "0.15.0"
   category: project-management
   mcp_server: chorus
 ---

package/.next/standalone/public/kiro-plugin/.kiro/skills/chorus-proposal/SKILL.md

@@ -4,7 +4,7 @@ description: Chorus Proposal workflow — create proposals with document and tas
 license: AGPL-3.0
 metadata:
   author: chorus
-  version: "0.14.6"
+  version: "0.15.0"
   category: project-management
   mcp_server: chorus
 ---

package/.next/standalone/public/kiro-plugin/.kiro/skills/chorus-quick-dev/SKILL.md

@@ -4,7 +4,7 @@ description: Quick Task workflow — skip Idea→Proposal, create tasks directly
 license: AGPL-3.0
 metadata:
   author: chorus
-  version: "0.14.6"
+  version: "0.15.0"
   category: project-management
   mcp_server: chorus
 ---

package/.next/standalone/public/kiro-plugin/.kiro/skills/chorus-review/SKILL.md

@@ -4,7 +4,7 @@ description: Chorus Review workflow — approve/reject proposals, verify tasks,
 license: AGPL-3.0
 metadata:
   author: chorus
-  version: "0.14.6"
+  version: "0.15.0"
   category: project-management
   mcp_server: chorus
 ---

package/.next/standalone/public/kiro-plugin/.kiro/skills/chorus-yolo/SKILL.md

@@ -4,7 +4,7 @@ description: Full-auto AI-DLC pipeline — from prompt to done. Automates the en
 license: AGPL-3.0
 metadata:
   author: chorus
-  version: "0.14.6"
+  version: "0.15.0"
   category: project-management
   mcp_server: chorus
 ---

package/.next/standalone/public/kiro-plugin/bin/chorus-api.sh

@@ -240,7 +240,7 @@ cmd_mcp_tool() {
     # Step 1: Initialize MCP session
     local init_payload
     init_payload=$(cat <<JSONEOF
-{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-03-26","capabilities":{},"clientInfo":{"name":"chorus-hook","version":"0.14.6"}}}
+{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-03-26","capabilities":{},"clientInfo":{"name":"chorus-hook","version":"0.15.0"}}}
 JSONEOF
 )
 

package/README.ja.md

@@ -36,6 +36,8 @@ Idea ──> Proposal ──> [Document + Task DAG] ──> Execute ──> Veri
 
 ## 最近の更新
 
+**[v0.15.0](https://chorus-ai.dev/blog/chorus-v0.15.0-release/)** — プロジェクト単位の Agent 作業ディレクトリ：各ユーザーがプロジェクト内の Agent ごとにホストと cwd を設定し、デーモンが許可したルートだけを参照できます。割り当て、ウェイク、再開、後続ターンで同じ実行先を使い、進行中のセッションは移動しません。Codex は再開可能なバックエンド thread ID を別に保存し、不要になった Chorus の session 管理手順を削除しました。
+
 **[v0.14.1](https://chorus-ai.dev/blog/chorus-v0.14.1-release/)** — Amazon Kiro CLI が 4 つ目の接続方法になりました（Kiro CLI v2）：ワンコマンドの `install-kiro.sh` プラグインと `--agent kiro` デーモンバックエンド、加えていくつかのデーモン修正。
 
 **[v0.14.0](https://chorus-ai.dev/blog/chorus-v0.14.0-release/)** — アプリ全体のダークモード（ライト / ダーク / システム）。参考資料をあらゆる着想・提案・課題に添付でき、インラインでも MCP 経由でも読み取れます。韓国語と日本語を追加（韓国語はコミュニティによる貢献）。グループ化のための**テーマ**着想、デーモンの「開発を開始」/「Yolo」ボタン、対話式の着想入力、クラッシュからの再開、`chorus daemon install`。

package/README.ko.md

@@ -36,6 +36,8 @@ Idea ──> Proposal ──> [Document + Task DAG] ──> Execute ──> Veri
 
 ## 최근 업데이트
 
+**[v0.15.0](https://chorus-ai.dev/blog/chorus-v0.15.0-release/)** — 프로젝트별 Agent 작업 디렉터리: 각 사용자가 프로젝트의 Agent마다 호스트와 cwd를 지정하고, 데몬이 허용한 루트만 탐색할 수 있습니다. 배정, 웨이크, 재개, 후속 턴에서 같은 실행 위치를 사용하며 진행 중인 세션은 이동하지 않습니다. Codex는 재개 가능한 백엔드 thread ID를 별도로 저장하고, 더 이상 필요하지 않은 Chorus session 관리 단계를 제거했습니다.
+
 **[v0.14.1](https://chorus-ai.dev/blog/chorus-v0.14.1-release/)** — Amazon Kiro CLI가 네 번째 연결 방식이 되었습니다(Kiro CLI v2): 명령 한 줄로 설치하는 `install-kiro.sh` 플러그인과 `--agent kiro` 데몬 백엔드, 여기에 몇 가지 데몬 수정.
 
 **[v0.14.0](https://chorus-ai.dev/blog/chorus-v0.14.0-release/)** — 앱 전체 다크 모드(라이트 / 다크 / 시스템). 참고 자료를 어떤 아이디어·제안·작업에도 첨부할 수 있고, 인라인으로도 MCP를 통해서도 읽을 수 있습니다. 한국어와 일본어 추가(한국어는 커뮤니티 기여). 그룹화를 위한 **테마** 아이디어, 그리고 데몬의 개발 시작 / Yolo 버튼, 대화식 아이디어 입력, 크래시 복구, `chorus daemon install`.

package/README.md

@@ -36,6 +36,8 @@ The labels under each stage are the **permissions** an actor needs at that stage
 
 ## What's New
 
+**[v0.15.0](https://chorus-ai.dev/blog/chorus-v0.15.0-release/)** — Project-level Agent working directories: each user can bind every Agent in a project to a host and cwd, browse only daemon-approved roots, and use the same target across assignment, wake, resume, and later turns without moving active sessions. Codex now persists its resumable backend thread ID separately and drops obsolete Chorus session-management steps.
+
 **[v0.14.1](https://chorus-ai.dev/blog/chorus-v0.14.1-release/)** — Amazon Kiro CLI is the fourth way to connect (Kiro CLI v2): a one-command `install-kiro.sh` plugin and a `--agent kiro` daemon backend, plus daemon fixes.
 
 **[v0.14.0](https://chorus-ai.dev/blog/chorus-v0.14.0-release/)** — Dark mode across the app (light / dark / system). Reference artifacts: attach docs, repos, issues, and articles to any idea, proposal, or task, readable inline and over MCP. Korean and Japanese locales (Korean contributed by the community). **Theme** ideas for grouping, plus daemon Start Development / Yolo buttons, conversational idea entry, crash-resume, and `chorus daemon install`.
@@ -170,6 +172,7 @@ With no `--cwd`, the daemon serves the single directory it was launched from.
 | `apiKey` | string | Agent API key (`cho_…`) | `--api-key` flag → `CHORUS_API_KEY` → file |
 | `agentUuid` / `agentName` | string | Authenticated identity (recorded at login) | written by `chorus login` |
 | `cwds` | string[] | Working directories the daemon serves (multi-path) | `--cwd` flag(s) → `CHORUS_DAEMON_CWDS` → file → launch dir |
+| `browseRoots` | string[] | Roots allowed for project and temporary directory browsing | `--browse-root` flag(s) → `CHORUS_DAEMON_BROWSE_ROOTS` → file → user home |
 | `agent` | string | Local agent backend to wake (`claude-code` / `codex` / `kiro`) | `--agent` flag → `CHORUS_AGENT` → file → `claude-code` |
 | `sigintTimeoutMs` | number | Grace window (ms) after SIGINT before a forceful kill (default `10000`) | `--sigint-timeout` flag → `CHORUS_DAEMON_SIGINT_TIMEOUT` → file → `10000` |
 | `yoloAckAt` | string | Internal — timestamp of a TTY yolo confirmation (managed automatically) | — |

package/README.zh.md

@@ -27,6 +27,8 @@ Idea ──> Proposal ──> [Document + Task DAG] ──> Execute ──> Veri
 
 ## 最近更新
 
+**[v0.15.0](https://chorus-ai.dev/zh/blog/chorus-v0.15.0-release/)** — 项目级 Agent 工作目录：每位用户可以为项目中的每个 Agent 绑定主机和 cwd，只浏览 daemon 允许的目录，并让任务分配、唤醒、恢复和后续对话使用同一个执行位置，且不迁移进行中的会话。Codex 现在会单独保存可恢复的后端 thread ID，并移除不再需要的 Chorus session 管理步骤。
+
 **[v0.14.1](https://chorus-ai.dev/zh/blog/chorus-v0.14.1-release/)** — Amazon Kiro CLI 成为第四种接入方式（Kiro CLI v2）：一条命令的 `install-kiro.sh` 插件，以及 `--agent kiro` 的 daemon 后端，另有若干 daemon 修复。
 
 **[v0.14.0](https://chorus-ai.dev/zh/blog/chorus-v0.14.0-release/)** — 全应用深色模式（浅色 / 深色 / 跟随系统）。参考资料可挂到任意想法、提案或任务上，行内可读，也能通过 MCP 读写。新增韩语和日语（韩语由社区贡献）。用于归类的**主题**想法，以及 daemon 的「开始开发」/「Yolo」按钮、对话式建想法、崩溃恢复与 `chorus daemon install`。

package/cli/client-args.mjs

@@ -60,6 +60,10 @@ export function parseClientFlags(argv) {
       const value = a === "--cwd" ? argv[i + 1] : a.slice("--cwd=".length);
       if (typeof value === "string") (out.cwd ??= []).push(value);
     }
+    else if (a === "--browse-root" || a.startsWith("--browse-root=")) {
+      const value = a === "--browse-root" ? argv[i + 1] : a.slice("--browse-root=".length);
+      if (typeof value === "string") (out.browseRoot ??= []).push(value);
+    }
     else if (a === "--chorus-only") out.chorusOnly = true;
     else if (a === "--verbose") out.verbose = true;
     else if (a === "-d" || a === "--detach") out.detach = true;
@@ -133,6 +137,10 @@ OPTIONS
                            connection for that path, so one daemon can serve several
                            local paths at once. Default: the directory it was launched
                            from. (Also configurable as "cwds":[…] in ~/.chorus/daemon.json.)
+  --browse-root <path>     A directory root exposed to remote cwd discovery.
+                           Repeatable; independent from --cwd and does not create
+                           Agent connections. (env: CHORUS_DAEMON_BROWSE_ROOTS;
+                           config: "browseRoots":[…]; default: OS user home.)
   -d, --detach             Run detached in the background (pidfile + logfile)
   -y, --yes                Non-interactive install: skip all 'chorus daemon
                            install' prompts (credentials, served cwds, and agent

package/cli/codex-spawner.mjs

@@ -224,7 +224,7 @@ export class CodexSpawner {
    * @param {{ prompt: string, sessionId: string|null, isNew?: boolean, mcpConfigPath?: string,
    *           cwd?: string, onMessage?: (obj: any) => void,
    *           onChild?: (child: import("node:child_process").ChildProcess) => void }} params
-   * @returns {Promise<{ sessionId: string, exitCode: number|null, isNew: boolean }>}
+   * @returns {Promise<{ sessionId: string, backendSessionId: string|null, exitCode: number|null, isNew: boolean }>}
    */
   async wake({ prompt, sessionId, cwd, onMessage, onChild }) {
     const anchor = typeof sessionId === "string" ? sessionId : "";
@@ -245,7 +245,7 @@ export class CodexSpawner {
     if (!codexPath) {
       // No crash — surface visibly and resolve with a failure result.
       this.logger.error("[Chorus] cannot locate the `codex` executable on PATH; skipping wake");
-      return { sessionId: anchor, exitCode: null, isNew };
+      return { sessionId: anchor, backendSessionId: knownThreadId, exitCode: null, isNew };
     }
 
     if (!this.mcpConfigChecked) {
@@ -287,7 +287,7 @@ export class CodexSpawner {
         });
       } catch (err) {
         this.logger.error(`[Chorus] failed to spawn codex: ${err}`);
-        resolve({ sessionId: anchor, exitCode: null, isNew });
+        resolve({ sessionId: anchor, backendSessionId: knownThreadId, exitCode: null, isNew });
         return;
       }
 
@@ -350,14 +350,14 @@ export class CodexSpawner {
 
       child.on("error", (err) => {
         this.logger.error(`[Chorus] codex process error: ${err}`);
-        resolve({ sessionId: observedThreadId || anchor, exitCode: null, isNew });
+        resolve({ sessionId: anchor, backendSessionId: observedThreadId, exitCode: null, isNew });
       });
 
       child.on("close", (code) => {
         if (code !== 0) {
           this.logger.warn(`[Chorus] codex exited with code ${code}`);
         }
-        resolve({ sessionId: observedThreadId || anchor, exitCode: code, isNew });
+        resolve({ sessionId: anchor, backendSessionId: observedThreadId, exitCode: code, isNew });
       });
 
       // Guard against an ASYNC stdin error (EPIPE) so it never becomes an

package/cli/control-handler.mjs

@@ -66,6 +66,8 @@ export function createControlHandler(deps) {
   const sigintTimeoutMs = deps.sigintTimeoutMs;
   const redispatchResume = deps.redispatchResume;
   const deliverTurn = deps.deliverTurn;
+  const handleDirectoryRequest = deps.handleDirectoryRequest;
+  const reportDirectoryRequest = deps.reportDirectoryRequest;
   const logger = deps.logger ?? NOOP_LOGGER;
 
   /** Registry key for a resource — MUST match waker.#execKey. */
@@ -89,7 +91,8 @@ export function createControlHandler(deps) {
       if (
         event.command !== "interrupt" &&
         event.command !== "resume" &&
-        event.command !== "deliver_turn"
+        event.command !== "deliver_turn" &&
+        event.command !== "browse_directory"
       ) {
         // Forward-compatible: the wire enum may grow.
         logger.warn(`[Chorus] control command "${event.command}" not supported; ignoring`);
@@ -109,6 +112,28 @@ export function createControlHandler(deps) {
         return;
       }
 
+      if (command === "browse_directory") {
+        const requestUuid = event.requestUuid;
+        if (typeof requestUuid !== "string" || !requestUuid) {
+          logger.warn("[Chorus] control: browse_directory missing requestUuid; ignoring");
+          return;
+        }
+        Promise.resolve()
+          .then(() => handleDirectoryRequest?.(event))
+          .then((result) => reportDirectoryRequest?.({
+            requestUuid,
+            status: "succeeded",
+            ...result,
+          }))
+          .catch((err) => reportDirectoryRequest?.({
+            requestUuid,
+            status: "failed",
+            errorCode: err?.code ?? "INTERNAL_ERROR",
+          }))
+          .catch((err) => logger.warn(`[Chorus] control: directory report failed: ${err}`));
+        return;
+      }
+
       // --- deliver_turn: origin-only live delivery (子2). The session's origin connection
       //     (THIS one — Check 1 passed) was pinged that a SPECIFIC new pending
       //     `human_instruction` turn (`event.turnUuid`) awaits. Dispatch ONLY that turn — not
@@ -155,7 +180,11 @@ export function createControlHandler(deps) {
             `)`
         );
         try {
-          redispatchResume?.(entityType, entityUuid, resumeReason);
+          if (typeof event.runtimeCwd === "string" && event.runtimeCwd) {
+            redispatchResume?.(entityType, entityUuid, resumeReason, event.runtimeCwd);
+          } else {
+            redispatchResume?.(entityType, entityUuid, resumeReason);
+          }
         } catch (err) {
           logger.warn(`[Chorus] control: resume re-dispatch failed for ${entityType}:${entityUuid}: ${err}`);
         }

package/cli/daemon-config.mjs

@@ -200,3 +200,38 @@ export function resolveDaemonCwds(flags = {}, deps = {}) {
   //    for (HARD-1 / single-path — exactly today's behavior).
   return [undefined];
 }
+
+/**
+ * Resolve the host-local directory discovery allowlist. Unlike `cwds`, these
+ * roots never create connections. The whole list comes from the first
+ * non-empty source: flag > env > daemon.json > OS home.
+ */
+export function resolveBrowseRoots(flags = {}, deps = {}) {
+  const env = deps.env ?? process.env;
+  const readJson = deps.readJson ?? readJsonSafe;
+  const loginPath = deps.loginPath ?? loginFilePath();
+  const home = deps.home ?? homedir();
+  const flagList = Array.isArray(flags.browseRoot)
+    ? flags.browseRoot
+    : typeof flags.browseRoot === "string"
+      ? [flags.browseRoot]
+      : [];
+  const fromFlags = cleanCwdList(flagList, home);
+  if (fromFlags.length) return fromFlags;
+
+  const envRaw = env.CHORUS_DAEMON_BROWSE_ROOTS;
+  if (typeof envRaw === "string" && envRaw.trim()) {
+    const separator = deps.delimiter ?? (process.platform === "win32" ? ";" : ":");
+    const fromEnv = cleanCwdList(
+      envRaw.split(envRaw.includes(",") ? "," : separator),
+      home,
+    );
+    if (fromEnv.length) return fromEnv;
+  }
+
+  const file = readJson(loginPath);
+  const fromFile = file && Array.isArray(file.browseRoots)
+    ? cleanCwdList(file.browseRoots, home)
+    : [];
+  return fromFile.length ? fromFile : [normalizeCwd(home, home)];
+}

package/cli/daemon-install-config.mjs

@@ -217,6 +217,32 @@ export async function resolveInstallCwds(flags = {}, opts = {}) {
   return { cwds: finalCwds };
 }
 
+/** Persist explicit install-time browse roots without coupling them to `cwds`. */
+export async function resolveInstallBrowseRoots(flags = {}, opts = {}) {
+  const readJson = opts.readJson ?? readJsonSafe;
+  const loginPath = opts.loginPath ?? loginFilePath();
+  const writeConfig = opts.writeConfig ?? updateDaemonConfig;
+  const home = opts.home ?? homedir();
+  const flagList = Array.isArray(flags.browseRoot)
+    ? flags.browseRoot
+    : typeof flags.browseRoot === "string"
+      ? [flags.browseRoot]
+      : [];
+  const explicit = cleanCwdList(flagList, home);
+  if (explicit.length) {
+    writeConfig({ browseRoots: explicit });
+    return { browseRoots: explicit };
+  }
+  const file = readJson(loginPath);
+  const stored = file && Array.isArray(file.browseRoots)
+    ? cleanCwdList(file.browseRoots, home)
+    : [];
+  if (stored.length) return { browseRoots: stored };
+  const browseRoots = [normalizeCwd(home, home)];
+  writeConfig({ browseRoots });
+  return { browseRoots };
+}
+
 /**
  * The interactive agent-backend menu. Order mirrors KNOWN_AGENTS with claude-code
  * first (it is the default). Kept beside the resolver so the numbered prompt and

package/cli/daemon-rest-client.mjs

@@ -70,11 +70,12 @@ const NOOP_LOGGER = { info() {}, warn() {}, error() {} };
  *   logger?: { info(m:string):void, warn(m:string):void, error(m:string):void },
  * }} opts
  * @returns {{
- *   turnAdvance: (p: { sessionId: string, status: string, entityType?: string|null, entityUuid?: string|null }) => Promise<DaemonRestResult>,
+ *   turnAdvance: (p: { sessionId: string, backendSessionId?: string|null, status: string, entityType?: string|null, entityUuid?: string|null }) => Promise<DaemonRestResult>,
  *   transcript: (p: { sessionId: string, messages: Array<{ role: string, text: string }> }) => Promise<DaemonRestResult>,
  *   executionState: (p: { executions: Array<Record<string, unknown>> }) => Promise<DaemonRestResult>,
  *   reportInterrupt: (p: { entityType: string, entityUuid: string, reason: string }) => Promise<DaemonRestResult>,
  *   heartbeat: (p: { connectionUuid: string, connectedAt: string }) => Promise<DaemonRestResult>,
+ *   reportDirectoryRequest: (p: { requestUuid: string, status: "succeeded"|"failed", roots?: string[], items?: Array<{name:string,path:string}>, nextCursor?: string|null, normalizedPath?: string, errorCode?: string }) => Promise<DaemonRestResult>,
  *   readPendingTurns: () => Promise<DaemonRestResult>,
  * }}
  */
@@ -146,7 +147,7 @@ export function createDaemonRestClient(opts) {
      * the turn's usage. Both ride the terminal edge only. Requires the connectionUuid (the
      * server addresses the turn against a connection the agent owns).
      */
-    async turnAdvance({ sessionId, status, entityType, entityUuid, interruptedReason, transcriptRelayError, usage }) {
+    async turnAdvance({ sessionId, status, entityType, entityUuid, interruptedReason, transcriptRelayError, usage, backendSessionId }) {
       const connectionUuid = getConnectionUuid();
       if (!connectionUuid) {
         const error = `cannot advance turn for session ${sessionId} → ${status} — no connection uuid yet`;
@@ -171,6 +172,7 @@ export function createDaemonRestClient(opts) {
         ...(transcriptRelayError ? { transcriptRelayError } : {}),
         // The whole normalized TokenUsage object, nested under `usage`, only on a terminal edge.
         ...(usage && isTerminal ? { usage } : {}),
+        ...(backendSessionId && isTerminal ? { backendSessionId } : {}),
       };
       return post(
         "turn-advance",
@@ -254,6 +256,29 @@ export function createDaemonRestClient(opts) {
       );
     },
 
+    async reportDirectoryRequest({ requestUuid, status, roots, items, nextCursor, normalizedPath, errorCode }) {
+      const connectionUuid = getConnectionUuid();
+      if (!connectionUuid) {
+        const error = `cannot report directory request ${requestUuid} — no connection uuid yet`;
+        logger.warn(`[Chorus] ${error}`);
+        return { ok: false, status: null, error, skipped: true };
+      }
+      const body = { requestUuid, connectionUuid, status };
+      if (status === "succeeded") {
+        if (roots !== undefined) body.roots = roots;
+        if (items !== undefined) body.items = items;
+        if (nextCursor !== undefined) body.nextCursor = nextCursor;
+        if (normalizedPath !== undefined) body.normalizedPath = normalizedPath;
+      } else {
+        body.errorCode = errorCode ?? "INTERNAL_ERROR";
+      }
+      return post(
+        "directory-request report",
+        "/api/daemon/directory-request/report",
+        body,
+      );
+    },
+
     /**
      * GET /api/daemon/pending-turns?connectionUuid=… — read this connection's unstarted
      * (pending) turns from the turn table (the reconnect-backfill / deliver_turn source).

package/cli/daemon.mjs

@@ -17,6 +17,7 @@ import { prompt, writeLoginFile, updateDaemonConfig } from "./login.mjs";
 import {
   resolveInstallCredentials,
   resolveInstallCwds,
+  resolveInstallBrowseRoots,
   resolveInstallAgent,
 } from "./daemon-install-config.mjs";
 import {
@@ -46,7 +47,8 @@ import { createInterruptReporter } from "./interrupt-reporter.mjs";
 import { createTurnReporter } from "./turn-reporter.mjs";
 import { createDaemonRestClient } from "./daemon-rest-client.mjs";
 import { createControlHandler } from "./control-handler.mjs";
-import { resolveSigintTimeoutMs, resolveDaemonCwds } from "./daemon-config.mjs";
+import { resolveSigintTimeoutMs, resolveDaemonCwds, resolveBrowseRoots } from "./daemon-config.mjs";
+import { discoverDirectories, validateDirectory } from "./directory-discovery.mjs";
 import {
   startBackground,
   stopDaemon,
@@ -124,6 +126,7 @@ export function buildDaemon(creds, deps = {}) {
   // the layered resolver; falls back to the resolver's default here when not given,
   // so a daemon built directly (integration tests) still gets a sane value.
   const sigintTimeoutMs = deps.sigintTimeoutMs ?? resolveSigintTimeoutMs();
+  const browseRoots = deps.browseRoots ?? resolveBrowseRoots();
   // ===== Shared deps (one set per daemon process) =====
   // These are process-wide — independent of how many paths (cwds) the daemon serves.
   const mcpClient =
@@ -245,7 +248,8 @@ export function buildDaemon(creds, deps = {}) {
         fetchImpl: deps.fetchImpl,
       });
 
-    /** @type {Waker|undefined} */
+    /** @type {Map<string, Waker>} */
+    const runtimeWakers = new Map();
     let waker;
 
     // Execution + transcript upload hooks (子1), merged. Bound to THIS connection's
@@ -257,7 +261,8 @@ export function buildDaemon(creds, deps = {}) {
           url: creds.url,
           apiKey: creds.apiKey,
           getConnectionUuid: () => connectionState.connectionUuid,
-          getSnapshot: () => waker?.buildExecutionSnapshot() ?? [],
+          getSnapshot: () =>
+            [...runtimeWakers.values()].flatMap((candidate) => candidate.buildExecutionSnapshot()),
           logger,
           fetchImpl: deps.fetchImpl,
         }),
@@ -277,20 +282,69 @@ export function buildDaemon(creds, deps = {}) {
     // transcript (new-vs-resume) and to spawn, so they never diverge (Module Contract
     // 1 — resolveCwd is the single source). `cwd` is `undefined` for the single-path /
     // old-daemon default, which the Waker degrades to process.cwd() (HARD-1).
-    waker = new Waker({
-      creds,
-      lineage,
-      spawner,
-      cwd,
-      hooks,
-      logger,
-      reportInterrupt,
-      advanceTurn,
-      verbose,
-      // Graceful-shutdown kill escalation (fix-daemon-exit-orphan-running-turn):
-      // interruptAll() reuses the SAME window the interrupt control handler uses.
-      sigintTimeoutMs,
-    });
+    const makeWaker = (boundCwd) =>
+      new Waker({
+        creds,
+        lineage,
+        spawner,
+        cwd: boundCwd,
+        hooks,
+        logger,
+        reportInterrupt,
+        advanceTurn,
+        verbose,
+        validateRuntimeCwd: (runtimeCwd) => validateDirectory({ cwd: runtimeCwd, browseRoots }),
+        killer: deps.killer,
+        sigintTimeoutMs,
+      });
+    const startupKey = cwd ?? process.cwd();
+    runtimeWakers.set(startupKey, makeWaker(cwd));
+    const selectWaker = (notification) => {
+      const runtimeCwd =
+        typeof notification?.runtimeCwd === "string" && notification.runtimeCwd
+          ? notification.runtimeCwd
+          : startupKey;
+      let selected = runtimeWakers.get(runtimeCwd);
+      if (!selected) {
+        selected = makeWaker(runtimeCwd);
+        runtimeWakers.set(runtimeCwd, selected);
+      }
+      return selected;
+    };
+    const startupWaker = runtimeWakers.get(startupKey);
+    waker = {
+      get executions() {
+        const merged = new Map();
+        for (const candidate of runtimeWakers.values()) {
+          for (const [key, value] of candidate.executions) merged.set(key, value);
+        }
+        return merged;
+      },
+      get interrupting() {
+        return {
+          has: (key) =>
+            [...runtimeWakers.values()].some((candidate) => candidate.interrupting.has(key)),
+        };
+      },
+      keyFor: (notification) => startupWaker.keyFor(notification),
+      resolveCwd: () => startupWaker.resolveCwd(),
+      markQueued: (notification, key, attribution) =>
+        selectWaker(notification).markQueued(notification, key, attribution),
+      wake: (notification, key, attribution) =>
+        selectWaker(notification).wake(notification, key, attribution),
+      markInterrupting(entityType, entityUuid) {
+        for (const candidate of runtimeWakers.values()) {
+          if (candidate.executions.has(`${entityType}:${entityUuid}`)) {
+            candidate.markInterrupting(entityType, entityUuid);
+          }
+        }
+      },
+      interruptAll() {
+        for (const candidate of runtimeWakers.values()) candidate.interruptAll();
+      },
+      buildExecutionSnapshot: () =>
+        [...runtimeWakers.values()].flatMap((candidate) => candidate.buildExecutionSnapshot()),
+    };
     // The router reads THIS connection's own uuid lazily (same source the control handler
     // uses) to suppress a DIRECTED (pinned) wake stamped for a different connection
     // (fix-pinned-wake-directed-delivery, T2). Null until the SSE handshake assigns it — a
@@ -310,8 +364,8 @@ export function buildDaemon(creds, deps = {}) {
     // all scoped to THIS connection's uuid/router/backfill (see the original wiring
     // comments retained on the shared helpers). The control handler verifies a control
     // event against this connection's own connectionUuid before acting.
-    const redispatchResume = (entityType, entityUuid, resumeReason) => {
-      router.dispatchResume?.({ entityType, entityUuid, resumeReason });
+    const redispatchResume = (entityType, entityUuid, resumeReason, runtimeCwd) => {
+      router.dispatchResume?.({ entityType, entityUuid, resumeReason, runtimeCwd });
     };
     const deliverTurn = (turnUuid) => backfill?.pendingTurnsOnly?.(turnUuid);
     const onControl = createControlHandler({
@@ -320,6 +374,21 @@ export function buildDaemon(creds, deps = {}) {
       sigintTimeoutMs,
       redispatchResume,
       deliverTurn,
+      handleDirectoryRequest: async (event) => {
+        if (event.operation === "roots") {
+          return { roots: [...browseRoots] };
+        }
+        if (event.operation === "validate") {
+          return validateDirectory({ cwd: event.cwd, browseRoots });
+        }
+        return discoverDirectories({
+          prefix: event.prefix,
+          cursor: event.cursor,
+          limit: event.limit,
+          browseRoots,
+        });
+      },
+      reportDirectoryRequest: (result) => daemonRestClient.reportDirectoryRequest(result),
       logger,
     });
 
@@ -403,7 +472,17 @@ export function buildDaemon(creds, deps = {}) {
         logger,
       });
 
-    return { cwd, connectionState, waker, router, backfill, sseListener, hooks, outcome };
+    return {
+      cwd,
+      connectionState,
+      waker,
+      runtimeWakers,
+      router,
+      backfill,
+      sseListener,
+      hooks,
+      outcome,
+    };
   }
 
   // Build one connection per declared cwd. The order is the declaration order; the
@@ -569,6 +648,7 @@ export async function runDaemon(flags = {}, deps = {}) {
   // is exactly today's single-path behavior. JUST a list of paths — no project
   // binding (DEC-5: cwd ⟂ project). The daemon process's own cwd never changes.
   const cwds = resolveDaemonCwds({ cwd: flags.cwd }, { env });
+  const browseRoots = resolveBrowseRoots({ browseRoot: flags.browseRoot }, { env });
 
   // Foreground preflight: resolve/complete credentials + resolve the permission
   // posture (confirming yolo on a TTY). Reuses the same pfDeps bundle the detach
@@ -634,6 +714,7 @@ export async function runDaemon(flags = {}, deps = {}) {
   } else {
     log(`[Chorus] serving path: ${servedPaths[0]}`);
   }
+  log(`[Chorus] browse roots: ${browseRoots.join(", ")} (discovery only; no connections created)`);
 
   const daemon = build(creds, {
     logger: { info: log, warn: errLog, error: errLog },
@@ -642,6 +723,7 @@ export async function runDaemon(flags = {}, deps = {}) {
     verbose,
     sigintTimeoutMs,
     cwds,
+    browseRoots,
   });
 
   // Graceful shutdown on signals.
@@ -778,6 +860,7 @@ export async function handleLifecycleAction(action, { log, errLog, lifecycle, se
     const installCfg = svc.installConfig ?? {
       resolveInstallCredentials,
       resolveInstallCwds,
+      resolveInstallBrowseRoots,
       resolveInstallAgent,
     };
 
@@ -811,6 +894,13 @@ export async function handleLifecycleAction(action, { log, errLog, lifecycle, se
       prompt: pfDeps?.askPrompt,
       log,
     });
+    if (installCfg.resolveInstallBrowseRoots) {
+      await installCfg.resolveInstallBrowseRoots(flags, {
+        writeConfig: pfDeps?.writeConfig ?? updateDaemonConfig,
+        readJson: pfDeps?.readJson,
+        loginPath: pfDeps?.loginPath,
+      });
+    }
 
     // Configure + persist the agent backend to daemon.json `agent` (single source
     // of truth; the unit carries no --agent, exactly like --cwd). Prompts an