diff --git a/apps/presentation/dashboard/src/features/personal-workspace/goal-create-request.ts b/apps/presentation/dashboard/src/features/personal-workspace/goal-create-request.ts
index d7e13ae233..3b10663f5b 100644
--- a/apps/presentation/dashboard/src/features/personal-workspace/goal-create-request.ts
+++ b/apps/presentation/dashboard/src/features/personal-workspace/goal-create-request.ts
@@ -18,7 +18,7 @@ export function goalCreateContent(input: GoalContent, t: WorkspaceTranslate) {
 
 /** One preview builder for explicit forms and conversational drafts. No effects. */
 export function goalCreateRequest(input: GoalContent & {
-  agentId: string; permission: string; contextGoalId: string | null; operationId?: string;
+  workspaceRef?: string; agentId: string; permission: string; contextGoalId: string | null; operationId?: string;
 }, t: WorkspaceTranslate): WorkspaceActionPreviewRequest {
   const content = goalCreateContent(input, t);
   return {
@@ -28,7 +28,7 @@ export function goalCreateRequest(input: GoalContent & {
     normalizedParameters: {
       ...content, goal_id: `goal-${input.operationId ?? crypto.randomUUID()}`,
       agent_id: input.agentId, permission: input.permission,
-      workspace_ref: "current", heartbeat: { enabled: false, cadence: "1d", timezone: "Asia/Shanghai" },
+      workspace_ref: input.workspaceRef ?? "current", heartbeat: { enabled: false, cadence: "1d", timezone: "Asia/Shanghai" },
       stop_condition: "goal_complete",
     },
   };
diff --git a/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-contract.test.mjs b/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-contract.test.mjs
index 65b693d157..c276f88654 100644
--- a/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-contract.test.mjs
+++ b/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-contract.test.mjs
@@ -385,6 +385,13 @@ for (const contextGoalId of [null, "existing-research-goal"]) {
   assert.equal(request.normalizedParameters.goal_id, "goal-new-research");
   assert.notEqual(request.normalizedParameters.goal_id, contextGoalId);
 }
+const explicitWorkspace = goalCreateRequest({
+  objective: "Inspect the second project", completion: "A checked report", boundary: "Read only",
+  agentId: "research-agent", permission: "read_only", contextGoalId: "first-project",
+  workspaceRef: "second-project", operationId: "explicit-workspace",
+}, (key) => key);
+assert.equal(explicitWorkspace.normalizedParameters.workspace_ref, "second-project");
+assert.equal(explicitWorkspace.context.goal_id, "first-project", "Conversation and workspace remain separate");
 assert.match(page, /t\("proposal\.workspace\.current"\)/, "Create Goal localizes its execution workspace explanation");
 assert.match(i18n, /Current local workspace \(no Repository bound\)/, "English workspace copy explains that no repository is bound");
 assert.match(i18n, /当前本地工作区（未绑定 Repository）/, "Chinese workspace copy explains that no repository is bound");
diff --git a/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-page.tsx b/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-page.tsx
index 262dd21cdd..9aeae52278 100644
--- a/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-page.tsx
+++ b/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-page.tsx
@@ -2243,7 +2243,14 @@ export function PersonalWorkspacePage({
             {composerSuggestions}
             </div>
             {!composerCollapsed ? <>
-            {actionDraft ? <WorkspaceActionForm draft={actionDraft} onClose={() => setActionDraft(null)} onPreview={(request) => createPreview(request)} /> : null}
+            {actionDraft ? <WorkspaceActionForm draft={actionDraft} workspaceGoals={workspaceGoals} onClose={() => setActionDraft(null)} onPreview={async (request) => {
+              const proposal = await createPreview(request, { select: false });
+              if (proposal.gate?.kind === "workspace_unavailable") {
+                throw new Error(proposal.gate.summary);
+              }
+              if (isCurrentConversation()) setSelection({ item: proposal, kind: "proposal" });
+              return proposal;
+            }} /> : null}
             {imageAttachments.length ? <div className="personal-composer-images" aria-label={t("composer.imagesPending")}>{imageAttachments.map((attachment) => (
               <figure key={attachment.id}>
                 <img alt={attachment.name} src={attachment.dataUrl} />
diff --git a/apps/presentation/dashboard/src/features/personal-workspace/workspace-action-form.tsx b/apps/presentation/dashboard/src/features/personal-workspace/workspace-action-form.tsx
index c3a79f13cc..751749bb5b 100644
--- a/apps/presentation/dashboard/src/features/personal-workspace/workspace-action-form.tsx
+++ b/apps/presentation/dashboard/src/features/personal-workspace/workspace-action-form.tsx
@@ -1,7 +1,7 @@
 import { goalCreateContent, goalCreateRequest } from "./goal-create-request";
 import { useEffect, useId, useRef, useState } from "react";
 import { useWorkspaceI18n } from "./i18n";
-import type { WorkspaceActionPreviewRequest } from "./personal-workspace-model";
+import type { WorkspaceActionPreviewRequest, WorkspaceGoal } from "./personal-workspace-model";
 
 // Action identity comes from an explicit control, never from the text being edited.
 export type WorkspaceActionDraft = {
@@ -22,8 +22,9 @@ function boundedLength(value: string) {
   return Array.from(value.split(/\s+/u).filter(Boolean).join(" ")).length;
 }
 
-export function WorkspaceActionForm({ draft, onClose, onPreview }: {
+export function WorkspaceActionForm({ draft, workspaceGoals = [], onClose, onPreview }: {
   draft: WorkspaceActionDraft;
+  workspaceGoals?: WorkspaceGoal[];
   onClose: () => void;
   onPreview: (request: WorkspaceActionPreviewRequest) => Promise<unknown>;
 }) {
@@ -37,6 +38,7 @@ export function WorkspaceActionForm({ draft, onClose, onPreview }: {
   const [objective, setObjective] = useState(draft.text ?? "");
   const [completion, setCompletion] = useState(draft.completionCriteria ?? "");
   const [boundary, setBoundary] = useState(draft.executionBoundary ?? "");
+  const [workspaceRef, setWorkspaceRef] = useState("current");
   const [permission, setPermission] = useState<string>(draft.permission ?? "workspace_write_on_confirmation");
   const [interval, setInterval] = useState(draft.kind === "heartbeat" ? "1" : "2");
   const [unit, setUnit] = useState(draft.kind === "heartbeat" ? "d" : "h");
@@ -65,7 +67,7 @@ export function WorkspaceActionForm({ draft, onClose, onPreview }: {
     setError("");
     try {
       if (draft.kind === "goal") {
-        await onPreview(goalCreateRequest({ objective, completion, boundary, permission,
+        await onPreview(goalCreateRequest({ objective, completion, boundary, permission, workspaceRef,
           agentId: draft.agentId, contextGoalId: draft.goalId }, t));
         onClose();
         return;
@@ -103,6 +105,11 @@ export function WorkspaceActionForm({ draft, onClose, onPreview }: {
           {draft.kind === "goal" ? <>
             <label>{zh ? "完成标准" : "Completion criteria"}<textarea aria-label={zh ? "完成标准" : "Completion criteria"} required value={completion} onChange={(event) => setCompletion(event.target.value)} /></label>
             <label>{zh ? "执行边界（可选）" : "Execution boundary (optional)"}<textarea aria-label={zh ? "执行边界（可选）" : "Execution boundary (optional)"} value={boundary} onChange={(event) => setBoundary(event.target.value)} /></label>
+            <label>{zh ? "工作目录" : "Working directory"}<select aria-label={zh ? "工作目录" : "Working directory"} value={workspaceRef} onChange={(event) => setWorkspaceRef(event.target.value)}>
+              <option value="current">{zh ? "默认工作区（确认前检查）" : "Default workspace (check before confirming)"}</option>
+              {workspaceGoals.map((goal) => <option key={goal.goalId} value={goal.goalId}>{goal.title} · {goal.repository?.label ?? goal.goalId}</option>)}
+            </select></label>
+            <p>{zh ? "可沿用已有 Goal 的工作目录。未连接的目录需要先完成项目连接；选择目录不会增加执行权限。" : "Reuse an existing Goal’s working directory. Unconnected directories need project setup first; selecting a directory does not expand execution permissions."}</p>
             <label>{zh ? "执行权限" : "Execution permission"}<select aria-label={zh ? "执行权限" : "Execution permission"} value={permission} onChange={(event) => setPermission(event.target.value)}><option value="read_only">{zh ? "只读" : "Read only"}</option><option value="workspace_write_on_confirmation">{zh ? "确认后允许修改工作区" : "Allow workspace changes after confirmation"}</option></select></label>
           </> : null}
         </>}
diff --git a/docs/assets/personal-workspace/goal-workspace-selection-desktop.png b/docs/assets/personal-workspace/goal-workspace-selection-desktop.png
new file mode 100644
index 0000000000..3e0b3ddc7f
Binary files /dev/null and b/docs/assets/personal-workspace/goal-workspace-selection-desktop.png differ
diff --git a/docs/assets/personal-workspace/goal-workspace-selection-mobile.png b/docs/assets/personal-workspace/goal-workspace-selection-mobile.png
new file mode 100644
index 0000000000..b02d82a0c1
Binary files /dev/null and b/docs/assets/personal-workspace/goal-workspace-selection-mobile.png differ
diff --git a/docs/guides/personal-workspace-user-guide.md b/docs/guides/personal-workspace-user-guide.md
index 5160637105..41791501a4 100644
--- a/docs/guides/personal-workspace-user-guide.md
+++ b/docs/guides/personal-workspace-user-guide.md
@@ -158,6 +158,26 @@ loopx goal-lifecycle --goal-id <goal-id> --operation resume --actor-kind owner -
 
 ---
 
+### 创建 Goal 时选择已有工作目录 / Reuse a workspace when creating a Goal
+
+打开侧边栏的「创建 Goal」，填写目标和完成标准后，在「工作目录」中选择一个已有
+Goal，即可沿用它绑定的目录。检查配置并确认一次后，新的 Goal 在所选目录中创建；
+执行权限仍由表单中的权限选择与后端校验决定。对话草稿也可通过「修改」打开同一个表单。
+如果检查配置失败，目标文本与目录选择会保留供重试；失效或不可用的目录不会自动换成另一目录。
+
+默认工作区继续由现有连接配置解析。这一入口支持沿用**已注册 Goal 的目录**，不提供任意
+本机路径输入或新目录接入；未连接的目录仍需先通过
+[项目连接流程](../guides/newcomer-command-path.md)接入。创建前检查预览中的工作区标识。
+
+Open **Create Goal** in the sidebar, enter the objective and completion criteria, and select an
+existing Goal under **Working directory** to reuse its directory. Review and confirm once; the new
+Goal is created there under the selected execution permission and the existing backend checks.
+Conversational drafts reach the same form through **Edit**. A failed preview retains the text and
+selection for retry; unavailable selections do not silently redirect to another directory. The
+default still follows existing connection routing. This supports registered Goal workspaces, not
+arbitrary path entry or new-directory onboarding; connect a new project first and check the workspace
+reference in the creation preview.
+
 ## 🎯 4. Goal 深度工作区
 
 在侧边栏点击具体的 Goal（例如 `Apollo Spacecraft Telemetry Pipeline`），进入该 Goal 的独立工作台。
diff --git a/examples/personal-workspace-browser-smoke.mjs b/examples/personal-workspace-browser-smoke.mjs
index 4b301ad669..e3c05fd518 100644
--- a/examples/personal-workspace-browser-smoke.mjs
+++ b/examples/personal-workspace-browser-smoke.mjs
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import {goalWorkspaceSelectionScenario} from "./personal-workspace-browser/goal-workspace-selection.mjs";
 import { replanCadenceScenario } from "./personal-workspace-browser/replan-cadence.mjs";
 import {nativeChildActivityScenario} from "./personal-workspace-browser/native-child-activity.mjs";
 import {privateStewardScopeScenario} from "./personal-workspace-browser/private-steward-scope.mjs";
@@ -97,6 +98,7 @@ scenarioCatalog.push(researchResultsScenario);
 scenarioCatalog.push(prReviewAgentOrderScenario);
 scenarioCatalog.push(taskInspectorReturnScenario);
 scenarioCatalog.push(replanCadenceScenario);
+scenarioCatalog.push(goalWorkspaceSelectionScenario);
 const requestedScenario = process.env.LOOPX_PERSONAL_WORKSPACE_SCENARIO;
 const scenarios = requestedScenario
   ? scenarioCatalog.filter((scenario) => scenario.id === requestedScenario)
diff --git a/examples/personal-workspace-browser/goal-workspace-backend.py b/examples/personal-workspace-browser/goal-workspace-backend.py
new file mode 100644
index 0000000000..71e40e2767
--- /dev/null
+++ b/examples/personal-workspace-browser/goal-workspace-backend.py
@@ -0,0 +1,47 @@
+"""Disposable real action/registry backend; only model dispatch is synthetic."""
+import json
+import os
+import tempfile
+from pathlib import Path
+import runpy
+import signal
+import sys
+
+from loopx.chat_action_store import ChatActionStore
+from loopx.chat_actions import ChatActionService
+from loopx.chat_server import ChatHTTPServer, ChatRequestHandler
+from loopx.chat_store import ChatSessionStore
+from loopx.control_plane.effect_runtime import restart_effect_runtime
+
+
+root = Path(sys.argv[1]).resolve()
+tempfile.tempdir = str(root)
+for variable in ("TMPDIR", "TEMP", "TMP"):
+    os.environ[variable] = str(root)
+fixture = runpy.run_path(str(Path(__file__).resolve().parents[1] / "loopx-chat-actions-smoke.py"))
+registry, _ = fixture["write_registry_fixture"](root / "first")
+other_registry, _ = fixture["write_registry_fixture"](root / "second")
+data = json.loads(registry.read_text())
+other = json.loads(other_registry.read_text())["goals"][0]
+data["goals"][0]["id"] = "product-release"
+other["id"] = "research-monitor"
+data["goals"].append(other)
+registry.write_text(json.dumps(data), encoding="utf-8")
+runtime = Path(data["common_runtime_root"])
+store, sessions = ChatActionStore(runtime / "chat/actions"), ChatSessionStore(runtime)
+controller = fixture["FakeRuntimeController"](sessions)
+service = ChatActionService(store=store, registry_path=registry,
+    chat_store=sessions, runtime_controller=controller)
+server = ChatHTTPServer(("127.0.0.1", 0), ChatRequestHandler)
+server.registry_path, server.runtime_root = registry, runtime
+server.action_store, server.action_service = store, service
+server.chat_store, server.runtime_controller = sessions, controller
+server.verbose = False
+signal.signal(signal.SIGTERM, lambda *_: sys.exit(0))
+print(json.dumps({"port": server.server_port, "registry": str(registry),
+    "first": data["goals"][0]["repo"], "second": other["repo"]}), flush=True)
+try:
+    server.serve_forever()
+finally:
+    server.server_close()
+    restart_effect_runtime()
diff --git a/examples/personal-workspace-browser/goal-workspace-selection.mjs b/examples/personal-workspace-browser/goal-workspace-selection.mjs
new file mode 100644
index 0000000000..1f666eea13
--- /dev/null
+++ b/examples/personal-workspace-browser/goal-workspace-selection.mjs
@@ -0,0 +1,103 @@
+import assert from "node:assert/strict";
+import {spawn} from "node:child_process";
+import {mkdtemp, readFile, rename, rm} from "node:fs/promises";
+import {tmpdir} from "node:os";
+import {resolve} from "node:path";
+import {createInterface} from "node:readline";
+import {resolveTestPython} from "../../scripts/test-python.mjs";
+import {outputDir, repoRoot} from "./fixture.mjs";
+import {openWorkspacePage} from "./scenario-context.mjs";
+
+export const goalWorkspaceSelectionScenario = {
+  id: "goal-workspace-selection",
+  async run({browser, collectCoverage, url}) {
+    const root = await mkdtemp(resolve(tmpdir(), "loopx-goal-workspace-"));
+    const child = spawn(resolveTestPython(), ["-u", resolve(repoRoot, "examples/personal-workspace-browser/goal-workspace-backend.py"), root],
+      {cwd: repoRoot, stdio: ["ignore", "pipe", "pipe"]});
+    const lines = createInterface({input: child.stdout});
+    let diagnostics = "", context;
+    child.stderr.on("data", chunk => {diagnostics = (diagnostics + chunk).slice(-6000);});
+    try {
+      const backend = await new Promise((accept, reject) => {
+        const timer = setTimeout(() => reject(new Error(`Workspace backend startup: ${diagnostics}`)), 30000);
+        child.once("error", error => {clearTimeout(timer); reject(error);});
+        child.once("exit", () => {clearTimeout(timer); reject(new Error(`Workspace backend exited: ${diagnostics}`));});
+        lines.once("line", line => {clearTimeout(timer); try {accept(JSON.parse(line));} catch (error) {reject(error);}});
+      });
+      const requests = [], applied = [];
+      let rejectPreview = true;
+      context = await openWorkspacePage(browser, url, {collectCoverage, beforeGoto: async (_api, page) => {
+        await page.route("**/api/actions{,/**,?*}", async route => {
+          const request = route.request(), path = new URL(request.url());
+          if (path.pathname.endsWith("/preview")) {
+            requests.push(request.postDataJSON());
+            if (rejectPreview) {
+              await route.fulfill({status: 503, json: {ok: false, error: "Workspace service unavailable; retry."}});
+              return;
+            }
+          }
+          const response = await route.fetch({url: `http://127.0.0.1:${backend.port}${path.pathname}${path.search}`});
+          if (path.pathname.endsWith("/apply")) applied.push(await response.json());
+          await route.fulfill({response});
+        });
+      }});
+      const {page} = context;
+      await page.getByRole("button", {name: "创建 Goal", exact: true}).first().click();
+      const form = page.getByRole("dialog", {name: "创建新 Goal"});
+      await form.getByLabel("目标", {exact: true}).fill("核对第二个项目的公开文档");
+      await form.getByLabel("完成标准", {exact: true}).fill("输出带来源的检查结果");
+      await form.getByLabel("执行权限", {exact: true}).selectOption("read_only");
+      const directory = form.getByLabel("工作目录", {exact: true});
+      await directory.selectOption("research-monitor");
+      await directory.focus();
+      assert.equal(await directory.evaluate(node => node === document.activeElement), true);
+      await page.screenshot({path: resolve(outputDir, "goal-workspace-selection-desktop.png"), animations: "disabled"});
+      await form.getByRole("button", {name: "检查配置"}).click();
+      await form.getByRole("alert").waitFor();
+      assert.equal(await directory.inputValue(), "research-monitor");
+      assert.equal(await form.getByLabel("目标", {exact: true}).inputValue(), "核对第二个项目的公开文档");
+      assert.equal(JSON.parse(await readFile(backend.registry, "utf8")).goals.length, 2);
+      await page.setViewportSize({width: 390, height: 844});
+      await directory.scrollIntoViewIfNeeded();
+      const bounds = await form.boundingBox();
+      assert.ok(bounds && bounds.x >= 0 && bounds.x + bounds.width <= 390);
+      await page.screenshot({path: resolve(outputDir, "goal-workspace-selection-mobile.png"), animations: "disabled"});
+      rejectPreview = false;
+      await rename(backend.second, `${backend.second}-unavailable`);
+      await form.getByRole("button", {name: "检查配置"}).click();
+      await form.getByRole("alert").filter({hasText: "workspace is unavailable"}).waitFor();
+      assert.equal(await directory.inputValue(), "research-monitor");
+      assert.equal(JSON.parse(await readFile(backend.registry, "utf8")).goals.length, 2);
+      await rename(`${backend.second}-unavailable`, backend.second);
+      await form.getByRole("button", {name: "检查配置"}).click();
+      await page.getByText("确认执行", {exact: true}).waitFor();
+      assert.equal(requests.at(-1).normalized_parameters.workspace_ref, "research-monitor");
+      assert.equal(JSON.parse(await readFile(backend.registry, "utf8")).goals.length, 2, "Preview created a Goal");
+      const confirm = page.getByRole("button", {name: /创建 Goal.*开始首轮/});
+      await confirm.click();
+      await page.waitForFunction(() => document.body.innerText.includes("进入新 Goal"));
+      assert.equal(applied.length, 1);
+      assert.equal(applied[0].proposal.receipt.projection_verified, true);
+      const goalId = requests.at(-1).normalized_parameters.goal_id;
+      const registry = JSON.parse(await readFile(backend.registry, "utf8"));
+      const created = registry.goals.find(goal => goal.id === goalId);
+      assert.equal(created.repo, backend.second, "Confirmed Goal was created in the other workspace");
+      assert.equal(created.parent_goal_id, "research-monitor");
+      assert.notEqual(created.repo, backend.first);
+      const state = await readFile(resolve(created.repo, created.state_file), "utf8");
+      assert.match(state, /输出带来源的检查结果/);
+      return {coverageEntries: context.coverageEntries, errors: context.errors,
+        note: "Packaged directory choice, keyboard/mobile, preview failure retention and real HTTP/bootstrap/registry readback passed. Status fixtures and model dispatch are synthetic; no installed or live-model claim."};
+    } finally {
+      await context?.close();
+      lines.close();
+      if (child.exitCode === null && child.signalCode === null) {
+        const exited = new Promise(accept => child.once("exit", accept));
+        child.kill("SIGTERM");
+        const timer = setTimeout(() => child.kill("SIGKILL"), 5000);
+        try {await exited;} finally {clearTimeout(timer);}
+      }
+      await rm(root, {recursive: true, force: true});
+    }
+  },
+};
diff --git a/loopx/chat_actions.py b/loopx/chat_actions.py
index d5913717e3..d2aa3d00ef 100644
--- a/loopx/chat_actions.py
+++ b/loopx/chat_actions.py
@@ -460,58 +460,25 @@ def _project_for_goal_create(
                     raise ValueError("The original creation workspace is unavailable or changed; restore it before retrying")
                 source = next((goal for goal in goals if goal.get("id") == existing.get("parent_goal_id")), existing)
                 return project, source
+        # Explicit destinations outrank conversation context and legacy fallback.
+        # A missing/stale choice must ask again, never silently select another root.
         context_goal_id = str(context.get("goal_id") or "").strip()
+        source_id = context_goal_id if workspace_ref == "current" else workspace_ref
         source_goal = next(
-            (goal for goal in goals if str(goal.get("id") or "") == context_goal_id),
+            (goal for goal in goals if str(goal.get("id") or "") == source_id),
             None,
         )
-        if source_goal is None and workspace_ref != "current":
-            source_goal = next(
-                (goal for goal in goals if str(goal.get("id") or "") == workspace_ref),
-                None,
-            )
-        if source_goal is None and len(goals) == 1:
+        if source_goal is None and workspace_ref == "current" and len(goals) == 1:
             source_goal = goals[0]
-        if source_goal is None and workspace_ref == "current":
-            workspace_candidates = [
-                root
-                for root in self.workspace_roots
-                if root.is_dir()
-            ]
-            if len(workspace_candidates) == 1:
-                return workspace_candidates[0], {
-                    "id": "",
-                    "domain": "project-goal-control-plane",
-                    "repo": str(workspace_candidates[0]),
-                    "adapter": {"kind": "generic_project_goal_v0"},
-                }
+        if source_goal is None:
+            workspace_candidates = [root for root in self.workspace_roots if root.is_dir()]
             token_map = {
                 f"workspace-{hashlib.sha256(str(root).encode('utf-8')).hexdigest()[:12]}": root
                 for root in workspace_candidates
             }
-            if workspace_ref in token_map:
-                selected = token_map[workspace_ref]
-                return selected, {
-                    "id": "",
-                    "domain": "project-goal-control-plane",
-                    "repo": str(selected),
-                    "adapter": {"kind": "generic_project_goal_v0"},
-                }
-        elif source_goal is None and workspace_ref.startswith("workspace-"):
-            workspace_candidates = [
-                root
-                for root in self.workspace_roots
-                if root.is_dir()
-            ]
-            selected = next(
-                (
-                    root
-                    for root in workspace_candidates
-                    if workspace_ref
-                    == f"workspace-{hashlib.sha256(str(root).encode('utf-8')).hexdigest()[:12]}"
-                ),
-                None,
-            )
+            selected = (workspace_candidates[0]
+                        if workspace_ref == "current" and len(workspace_candidates) == 1
+                        else token_map.get(workspace_ref))
             if selected is not None:
                 return selected, {
                     "id": "",
@@ -539,7 +506,7 @@ def _project_for_goal_create(
                 gate={
                     "kind": "workspace_selection_required",
                     "summary": "Select one server-configured workspace before creating this Goal.",
-                    "next_action": "Start LoopX Chat with exactly one --scan-path workspace or regenerate from an existing Goal channel.",
+                    "next_action": "Choose an available workspace or a registered Goal workspace, then review again. Unlisted directories require server workspace setup.",
                     "candidates": candidates,
                 },
             )
diff --git a/tests/test_chat_goal_workspace_selection.py b/tests/test_chat_goal_workspace_selection.py
new file mode 100644
index 0000000000..34d92fc5eb
--- /dev/null
+++ b/tests/test_chat_goal_workspace_selection.py
@@ -0,0 +1,81 @@
+"""Explicit creation destinations must not be overridden by conversation routing."""
+import hashlib
+import json
+
+import pytest
+
+from loopx.chat_action_store import ChatActionStore
+from loopx.chat_actions import ChatActionService, ProtectedActionGate
+
+
+@pytest.fixture
+def workspace_service(tmp_path):
+    first, second = tmp_path / "first", tmp_path / "second"
+    first.mkdir()
+    second.mkdir()
+    registry = tmp_path / "registry.json"
+    registry.write_text(json.dumps({"schema_version": 1, "goals": [
+        {"id": "first-goal", "repo": str(first)},
+        {"id": "second-goal", "repo": str(second)},
+    ]}))
+    service = ChatActionService(store=ChatActionStore(tmp_path / "actions"),
+        registry_path=registry, workspace_roots=[first, second])
+    return service, registry, first, second
+
+
+def resolve(service, workspace_ref, context_goal=None):
+    return service._project_for_goal_create({
+        "normalized_parameters": {"workspace_ref": workspace_ref},
+        "context": {"kind": "manager", "goal_id": context_goal},
+    })
+
+
+def test_explicit_goal_workspace_wins_over_conversation(workspace_service):
+    service, _, _, second = workspace_service
+    project, source = resolve(service, "second-goal", "first-goal")
+    assert project == second
+    assert source["id"] == "second-goal"
+
+
+@pytest.mark.parametrize("single_goal", [False, True])
+def test_configured_workspace_wins_over_context_and_single_goal(workspace_service, single_goal):
+    service, registry, _, second = workspace_service
+    if single_goal:
+        data = json.loads(registry.read_text())
+        data["goals"] = data["goals"][:1]
+        registry.write_text(json.dumps(data))
+    token = "workspace-" + hashlib.sha256(str(second).encode()).hexdigest()[:12]
+    project, source = resolve(service, token, "first-goal" if not single_goal else None)
+    assert project == second
+    assert source["id"] == ""
+
+
+def test_unknown_selection_never_falls_back_to_context(workspace_service):
+    service, _, _, _ = workspace_service
+    with pytest.raises(ProtectedActionGate) as error:
+        resolve(service, "missing-goal", "first-goal")
+    assert error.value.gate["kind"] == "workspace_selection_required"
+
+
+def test_unavailable_selected_workspace_never_falls_back(workspace_service):
+    service, _, _, second = workspace_service
+    second.rmdir()
+    with pytest.raises(ProtectedActionGate) as error:
+        resolve(service, "second-goal", "first-goal")
+    assert error.value.gate["kind"] == "workspace_unavailable"
+
+
+def test_current_retains_existing_context_routing(workspace_service):
+    service, _, first, _ = workspace_service
+    project, source = resolve(service, "current", "first-goal")
+    assert project == first
+    assert source["id"] == "first-goal"
+
+
+def test_bound_steward_rejects_goal_workspace_redirect(workspace_service):
+    service, _, _, _ = workspace_service
+    with pytest.raises(ValueError, match="bound steward workspace is unavailable"):
+        service._project_for_goal_create({
+            "normalized_parameters": {"workspace_ref": "second-goal"},
+            "context": {"kind": "manager", "goal_id": "first-goal", "binding_id": "steward-binding"},
+        })