@@ -1,5 +1,8 @@
 # Changelog — ChannelGate
 
+- Automatically link conversations sharing a working folder to one live setup, show the source in settings, and keep harness/model choices independent.
+
+
 - Show configured effort and a compact live activity phase beside the running model in Slack’s native Stop label.
 
 ChannelGate was formerly *Claude Gateway for Slack*; entries below the rename keep their original
 
@@ -1,5 +1,11 @@
 # ChannelGate — Features
 
+## Linked working-folder setup
+
+- Conversations assigned to an existing folder follow its established owner live: skills/template and scoped catalog skills, memory, instructions, access, connectors/channel secrets, VPN service metadata, mode/Auto/Lean/network and Drive setup. Shared edits direct users to the source; harness/model/effort/authentication and personal grants remain independent.
+- Admin and Slack settings identify the source; the folder picker explains linking. Durable files use owner identity/platform; cross-platform turns receive actual surface capabilities separately. Drive sync has one owner. Unlinking retains the effective setup; owner departure promotes a remaining conversation with its saved setup.
+
+
 Slack’s native running/Stop label shows the resolved model and explicitly configured effort, plus compact live phases (Thinking, Using tools, Writing, Waiting, Queued, Coordinating agents). Engine fallback replaces both model and effort; unset effort is omitted rather than guessed.
 
 ## User-linked dashboard passkeys
@@ -1099,11 +1105,7 @@ revocation removes future runtime grants. Source path/symlink/size validation re
 revisions on failed sync. Details and compatibility limits: `docs/SKILLS.md`.
 
 
-- **Slack reports shared-folder conflicts:** an authorized mention or typed command that cannot
-  start because channels share a folder with conflicting skills or memory settings gets a reply
-  in its triggering thread. The reply asks an admin to assign separate folders or align settings,
-  then retry. It exposes no other channel names or filesystem paths. The conflict still blocks
-  workspace writes and engine startup. → TEST-PLAN: Slack shared-folder conflict replies.
+- **Shared-folder conversations link automatically:** incompatible initial skills/memory adopt the established source setup. Settings identify the source, and divergent metadata edits explain where to edit. Engine/model choices stay local. → TEST-PLAN: Linked working-folder setup acceptance.
 
 - **Read/search account routing:** unrestricted information requests may search either or both
   available Composio identities without an account-selection interruption. Explicit account and
@@ -5380,12 +5382,8 @@ are retired, bullet by bullet; everything else stands.
   mirror remains current. Bundled source skills live in `src/gateway/skills/bundled/`.
 - Skills admin saves refresh existing workspaces immediately. Boot and a five-second daemon
   reconciliation pass refresh changed catalog/template/grant state, including MCP changes. Failed
-  writes are reported and retried; conflicting selections for a shared folder are reported.
-- The Admin UI makes shared-folder assignments visible before they break a run. Every channel or
-  DM whose effective working folder is assigned to another conversation gets a red warning row in
-  Conversations. The working-folder browser shows a red, named warning whenever the directory being
-  viewed is already assigned elsewhere, before **Use this folder** can create another shared
-  assignment. Both views use the runtime's resolved path logic rather than raw string comparison.
+  writes are reported and retried; shared folders follow one linked owner setup.
+- The Admin UI shows shared-folder conversations with a linked marker. The folder picker names existing assignments and explains inheritance; the editor opens the source conversation and locks inherited settings. Both views use the runtime's resolved path logic rather than raw strings.
 - Runtime settings provide **Reset to default** beside **Browse**. It clears only the custom
   working folder through the normal Save/Discard flow; the default remains
   `~/ChannelGate/<platform>/<slug>/`. Existing files stay in their original location.
 
@@ -1,5 +1,12 @@
 # ChannelGate — Test Plan
 
+## Linked working-folder setup acceptance
+
+Automated: `test/skills-workspace-sync.test.js`, `test/code-channels.test.js`, `test/workspace-conflict-reply.test.js`, `test/workspace-conflict-admin.test.js`, `test/workdir-boundary.test.js`. Verify automatic inheritance instead of skills/memory refusal, live source edits, owner-scoped skills, model independence, shared-write rejection, operator service secret filtering, established-owner selection, owner departure and explicit unlinking. `test/drivesync.test.js` covers sync selection; linked rows must never create a second bisync job.
+
+Live fixture (pending, run once with Claude and once with Codex): disposable private channels `cg-qa-linked-source` and `cg-qa-linked-follower`, same empty project directory, harmless test skill and memory sentinel. Set source Worker/network on; give follower different initial skills/memory. Select source folder from follower in Admin UI. Confirm source label/button, inherited controls, no conflict error, equal durable skill tree and source-scoped skill. Prompt follower: “Report your configured engine/model and the available shared test skill; add a test memory fact.” Change source skill/memory, retry, then change follower harness/model and confirm only runtime changes. Reject follower shared-setting edits with source guidance. Open an approved code channel from source and confirm it starts. Unlink follower and verify independent settings resume. Record message links, settings screenshots and engine evidence; no live PASS is claimed by automated checks. Restore/delete disposable fixtures. Cross-platform fixture: share a source with a Teams/Google Chat follower and verify actual-surface preamble while owner guide bytes remain stable. Drive fixture: valid disposable Drive folder, one scheduled job and one state directory, follower manual sync resolves to owner.
+
+
 Running label acceptance (Claude and Codex): in a Slack agent thread with chat:write.customize, select an explicit effort using /model, then ask “Read README.md and explain the startup flow.” Confirm Stop shows the selected model (effort), transitions through live tool/writing phases, and becomes active without an activity suffix after completion or Stop. Repeat with each engine and a different effort; verify fallback replaces model/effort. Pass only with observed Slack evidence. Live execution pending; automated coverage: test/slack-progress.test.js native Stop effort/phase test and test/slack-stop-progress.test.js late-event cancellation fixtures.
 
 ## User-linked dashboard access (2026-10-25)
@@ -3882,7 +3889,9 @@ observed tool/process/filesystem evidence, and verdict. A missing, skipped, or b
 is not a pass. Maintain the private QA registry alongside these reusable public instructions.
 
 
-## Shared-folder conflict detection and warnings
+## Shared-folder conflict detection and warnings (historical)
+
+Superseded by **Linked working-folder setup acceptance** at the top of this plan. The old rejection/red-warning expectations below describe historical behavior, not current acceptance gates.
 
 Automated regression: `node --test test/workspace-conflict-reply.test.js test/skills-workspace-sync.test.js
 test/workspace-conflict-admin.test.js`.
 
@@ -16,13 +16,17 @@ A Git branch alone does not isolate working files. Use a distinct worktree for e
 
 The gateway's per-thread queue orders requests within that thread. It does not lock every project file against work in another thread or an authorized developer session.
 
-## Align conversations sharing one folder
+## Linked folder setup
 
-A working folder also contains gateway-managed instructions, shared skill materialization, and portable memory files. Two conversations pointed at that folder cannot safely impose incompatible managed selections.
+Selecting a folder already assigned to another conversation links to that conversation's shared setup automatically. The established folder owner remains the source even when an older conversation joins later. Existing duplicate assignments resolve to the first stored conversation.
 
-ChannelGate checks compatible shared skill grants and memory settings before workspace synchronization. A conflict refuses provisioning with guidance to separate the folders or align the selections. It does not silently replace the other conversation's managed setup. The conflict notice does not disclose another conversation's identity or private folder path.
+Skills (including owner-scoped catalog skills), templates, memory settings and files, instructions, access policy, connectors, channel secrets, mode, Auto, Lean, network and Drive configuration follow the source live. Edit shared settings in the source conversation; attempts to create conflicting selections in a follower explain where to edit. Personal accounts and grants stay personal. Harness, model, effort, engine authentication and sessions remain independent.
 
-An administrator should identify every conversation assigned to the folder, compare direct grants, template-derived grants, organization grants, and memory settings, then either align them or assign separate paths. Separate paths are usually easier to reason about for unrelated projects.
+The conversation list shows a linked-folder marker. The folder picker explains inheritance before selection; the conversation editor names the source and provides an Open source conversation button. Slack Settings also identifies the source. One owner runs Drive synchronization; follower sync requests use that same job and state.
+
+Changing the working folder unlinks the conversation, retaining the last effective setup as its starting point. When the owner leaves, the first remaining conversation becomes the source using its saved setup. The gateway still refuses its private runtime/configuration trees and parent folders that would expose multiple workspaces. Folder assignment remains an administrator operation.
+
+A shared folder keeps the owner's operating guide stable; a follower on another chat platform receives its actual surface capabilities in each turn's prompt.
 
 ## Confirm the effective path
 
 
@@ -1459,7 +1459,7 @@ function workDirConflictSummary(conflict) {
   const names = others.map((item) => item.isDM || item.type === "im"
     ? (item.name || item.slug)
     : hashName(item.name || item.slug));
-  return `Working folder is also assigned to ${names.join(", ")}`;
+  return `Working folder setup is linked with ${names.join(", ")}`;
 }
 
 function convRow(key, color, name, sub, cost, conflict = null) {
@@ -1471,10 +1471,10 @@ function convRow(key, color, name, sub, cost, conflict = null) {
   // Compact whole-dollar 30-day cost (skip sub-$1 rows so the list stays quiet).
   const dollars = cost == null ? null : Math.round(cost);
   const costHtml = dollars && dollars >= 1 ? `<span class="conv-cost">$${escapeHtml(dollars.toLocaleString())}</span>` : "";
-  const conflictHtml = conflictText ? '<span class="conv-conflict-mark" aria-label="Working folder conflict">!</span>' : "";
+  const conflictHtml = conflictText ? '<span class="conv-conflict-mark" aria-label="Linked working folder">↔</span>' : "";
   el.innerHTML =
     `<span class="capdot" style="background:${color}"></span>` +
-    `<span class="conv-nm"><b>${escapeHtml(name)}</b>${sub ? `<small>${escapeHtml(sub)}</small>` : ""}${conflictText ? '<small class="conv-conflict-text">Shared working folder</small>' : ""}</span>` +
+    `<span class="conv-nm"><b>${escapeHtml(name)}</b>${sub ? `<small>${escapeHtml(sub)}</small>` : ""}${conflictText ? '<small class="conv-conflict-text">Linked folder setup</small>' : ""}</span>` +
     conflictHtml +
     costHtml;
   el.addEventListener("click", (e) => {
@@ -2098,15 +2098,16 @@ function renderChannelDetail(ch) {
     }
     const inherited = () => {
       const template = SKILL_TEMPLATES.find((t) => t.slug === templateSelect.value);
-      const section = catalog.skills.filter((s) => s.channelScope === ch.channelId && !s.deleted && s.visibility !== "personal").map((s) => s.slug);
+      const section = catalog.skills.filter((s) => s.channelScope === (meta.workspaceLink?.channelId || ch.channelId) && !s.deleted && s.visibility !== "personal").map((s) => s.slug);
       return [
         { id: "organization", label: "Organization skills", slugs: overview.orgSkills || [], note: "Managed organization-wide." },
         { id: "template", label: "Template skills", slugs: template?.resolved || [], note: template ? `Included by ${template.name}. Edit the template in Skills → Templates.` : "Choose a template above to include its skills." },
         ...(section.length ? [{ id: "section", label: "Conversation skills", slugs: section, note: "Included from this conversation’s repository section." }] : []),
       ];
     };
     skillsPicker = mountSkillAssignmentPicker(skillsBox, { skills: catalog.skills, sources: catalog.sources, selected: meta.skills || [], inherited: inherited(), onChange: markDirty });
-    templateSelect.disabled = false;
+    templateSelect.disabled = !!meta.workspaceLink;
+    if (meta.workspaceLink) for (const input of skillsBox.querySelectorAll("input,button,select")) input.disabled = true;
     templateSelect.addEventListener("change", () => skillsPicker.update({ inherited: inherited() }));
   }).catch((error) => {
     if (!skillsBox.isConnected) return;
@@ -2177,6 +2178,32 @@ function renderChannelDetail(ch) {
   card.querySelector(".ch-nodefaulttokens").checked = !!meta.noDefaultTokens;
   const workdirInput = card.querySelector(".ch-workdir");
   workdirInput.value = meta.workDir || "";
+  if (meta.workspaceLink) {
+    const notice = document.createElement("p");
+    notice.className = "hint";
+    notice.textContent = `Linked folder setup: ${meta.workspaceLink.name}. Skills, templates, memory, instructions, mode, network and Drive sync follow this source. Edit shared settings there; choose a separate folder to unlink. Harness and model remain independent.`;
+    const source = document.createElement("button");
+    source.type = "button";
+    source.textContent = "Open source conversation";
+    source.addEventListener("click", () => {
+      const id = meta.workspaceLink.channelId;
+      selectConv((DMS.some((d) => d.channelId === id) ? "dm:" : "ch:") + id);
+    });
+    for (const cap of capCards) { cap.style.pointerEvents = "none"; cap.setAttribute("aria-disabled", "true"); }
+    for (const pane of card.querySelectorAll('.subpane[data-pane="access"], .subpane[data-pane="connections"], .subpane[data-pane="mcps"], .subpane[data-pane="environment"], .subpane[data-pane="skills"]')) {
+      const locked = document.createElement("fieldset");
+      locked.disabled = true;
+      locked.style.cssText = "border:0;padding:0;margin:0;min-width:0";
+      while (pane.firstChild) locked.appendChild(pane.firstChild);
+      pane.appendChild(locked);
+    }
+    notice.appendChild(source);
+    card.querySelector(".dhead").after(notice);
+    for (const selector of [".ch-memory", ".ch-syncdrive", ".ch-synctest", ".ch-profile", ".ch-network", ".ch-admin", ".ch-bash", ".ch-auto", ".ch-clean"]) {
+      const input = card.querySelector(selector);
+      if (input) { input.disabled = true; input.title = "Edit this shared setting in the source conversation"; }
+    }
+  }
   card.querySelector(".ch-browse").addEventListener("click", () => openFolderPicker(workdirInput));
   card.querySelector(".ch-workdir-reset").addEventListener("click", () => {
     if (!workdirInput.value) return;
@@ -2429,7 +2456,7 @@ function renderChannelDetail(ch) {
       }
       const result = await api(`/api/channels/${encodeURIComponent(ch.channelId)}/meta`, {
         method: "PUT",
-        body: JSON.stringify({
+        body: JSON.stringify(Object.fromEntries(Object.entries({
           ...(harnessPolicyDirty ? { approvedEngines: approvals } : {}),
           ...channelGuestSavePatch(usersBox.dataset.ready === "1", explicitCheckedValues(usersBox), usersBox.dataset.changed === "1"),
           allowedMcps: selectedMcpEntries(mcpsBox, "claude")
@@ -2467,7 +2494,7 @@ function renderChannelDetail(ch) {
           makeToolboxUrl: makeToolboxUrlInput.value,
           ...(makeToolboxKey ? { makeToolboxKey } : {}),
           ...(clearMakeToolbox ? { clearMakeToolbox: true } : {}),
-        }),
+        }).filter(([key]) => !meta.workspaceLink?.fields?.includes(key)))),
       });
       // The server response is the validated, committed record. Reconcile the cached channel from
       // that whole record so a later SPA re-render cannot resurrect stale MCP/skill selections.
@@ -2499,6 +2526,10 @@ function renderChannelDetail(ch) {
       // conversation collections from the authoritative server rather than repainting stale flags.
       if (!(await refreshConversationRows())) renderConvList();
       detailDirty = false;
+      if (meta.workspaceLink?.slug !== ch.meta.workspaceLink?.slug) {
+        renderChannelDetail(ch);
+        return;
+      }
       savebarMsg.textContent = "Saved";
       savebarMsg.classList.add("clean");
       setTimeout(() => { if (!detailDirty) savebar.hidden = true; }, 1500);
@@ -2882,7 +2913,14 @@ function renderDmDetail(id) {
     <select class="dm-template"><option value="user">User template</option><option value="admin">Admin template</option><option value="custom">Custom</option></select>`;
   card.appendChild(tplField);
   const tplSel = tplField.querySelector(".dm-template");
-  tplSel.value = dm.template;
+  tplSel.value = dm.meta?.workspaceLink ? "custom" : dm.template;
+  if (dm.meta?.workspaceLink) {
+    tplSel.disabled = true;
+    const linked = document.createElement("p");
+    linked.className = "hint";
+    linked.textContent = `Shared setup linked to ${dm.meta.workspaceLink.name}. Edit shared settings in that source conversation; harness, model and effort remain independent.`;
+    head.after(linked);
+  }
 
   const customBox = document.createElement("div");
   customBox.className = "dm-custom";
@@ -2891,7 +2929,13 @@ function renderDmDetail(id) {
   const renderCustom = () => {
     customBox.innerHTML = "";
     ed = null;
-    if (tplSel.value === "custom") { ed = buildConfigEditor(dm.meta || {}); customBox.appendChild(ed.el); }
+    if (tplSel.value === "custom") {
+      ed = buildConfigEditor(dm.meta || {});
+      customBox.appendChild(ed.el);
+      if (dm.meta?.workspaceLink) for (const input of ed.el.querySelectorAll("input,select,button")) {
+        if (!input.matches(".cfg-engine,.cfg-model,.cfg-effort")) input.disabled = true;
+      }
+    }
   };
   renderCustom();
   paintCap(tplSel.value);
@@ -2903,7 +2947,8 @@ function renderDmDetail(id) {
     card, bar,
     async () => {
       const tpl = tplSel.value;
-      const body = { template: tpl, ...(tpl === "custom" && ed ? ed.getValues() : {}) };
+      const values = tpl === "custom" && ed ? ed.getValues() : {};
+      const body = { template: tpl, ...Object.fromEntries(Object.entries(values).filter(([key]) => !dm.meta?.workspaceLink?.fields?.includes(key))) };
       await api(`/api/dms/${encodeURIComponent(dm.channelId)}`, { method: "PUT", body: JSON.stringify(body) });
       dm.template = tpl;
       renderConvList();
@@ -4622,7 +4667,7 @@ async function fsBrowse(p) {
     const names = otherAssignments.map((item) => item.isDM || item.type === "im"
       ? (item.name || item.slug)
       : hashName(item.name || item.slug));
-    conflict.textContent = `Already assigned to ${names.join(", ")}. Selecting it here will share one working folder between conversations.`;
+    conflict.textContent = `Already assigned to ${names.join(", ")}. Selecting it links this conversation to the existing folder setup: skills, memory, instructions, mode, network and Drive sync. Harness and model stay independent.`;
     conflict.hidden = false;
   } else {
     conflict.textContent = "";