fix(qwen): address follow-up review — QWEN_HOME env, native hooks, MCP paths, canonical enablement

1. [P1] Read process.env.QWEN_HOME as fallback in both session analyzer
   resolveScope and customize provider defaultQwenHome.

2. [P1] Parse settings.json hooks in native Qwen shape: object keyed by
   event name → array of definitions → nested hooks array. Supports both
   command and http hook types.

3. [P1] User MCP now reads from <QWEN_HOME>/settings.json mcpServers
   (not ~/.mcp.json). Project MCP reads from <workspace>/.mcp.json (not
   <workspace>/.qwen/.mcp.json). Preserve url/httpUrl transport metadata.

4. [P2] Extension enablement now evaluates overrides against both lexical
   and canonical (realpathSync.native) workspace paths, matching native
   Qwen behavior for symlinked workspaces.

Also: agent-customize --help adds qwen/--qwen-home; reference doc
updated for native MCP paths and sanitizeCwd slug algorithm; rebased
onto current main. 866 tests pass; pack:verify passes.

Author: GCGH159

references/agent-customize/platforms/qwen.md

@@ -65,14 +65,18 @@ pointer to the real plugin root.
 ## External Context
 
 Use MCP when Qwen Code needs context or actions outside the repository. MCP
-configuration lives in `~/.mcp.json` (user) or `<project>/.mcp.json` (project).
-Start with one or two MCP tools that remove a real repeated manual step.
+servers are configured in `~/.qwen/settings.json` under `mcpServers` (user) or
+`<project>/.mcp.json` (project). Project-level `.qwen/settings.json` can also
+carry `mcpServers`. Start with one or two MCP tools that remove a real repeated
+manual step.
 
 ## Session Controls
 
 Keep one Qwen Code session per coherent unit of work. Session transcripts are
 recorded as JSONL under `~/.qwen/projects/<workspace-slug>/chats/`. The slug
-replaces path separators (and `.`/`_`) with `-`. Use worktrees when concurrent
+replaces every non-alphanumeric character with `-` (matching Qwen's native
+`sanitizeCwd`; on Windows the path is lowercased first). Use worktrees when
+concurrent
 sessions could edit the same files. Use subagents for bounded exploration,
 testing, or independent review.
 

scripts/agent-customize/cli.mjs

@@ -5,12 +5,12 @@ import { collectAgentCustomizeInventory, filterManageItems, groupManageItems } f
 
 function usage() {
   return [
-    "Usage: better-harness agent-customize [inventory|manage] --provider <cursor|qoder|codex|claude> [--workspace <path>]",
+    "Usage: better-harness agent-customize [inventory|manage] --provider <cursor|qoder|codex|claude|qwen> [--workspace <path>]",
     "       better-harness agent-customize manage --provider <provider> [--tab <tab>] [--query <text>] [--scope <scope>] [--group-by <key>]",
     "",
     "Collect configured agent-customize inventory for one provider as JSON.",
     "Provider home overrides: --cursor-home, --qoder-home, --codex-home, --claude-home,",
-    "--claude-state, --codex-app-path, --qoder-shared-client-cache-root.",
+    "--qwen-home, --claude-state, --codex-app-path, --qoder-shared-client-cache-root.",
     "",
   ].join("\n");
 }

scripts/agent-customize/providers/qwen.mjs

@@ -1,3 +1,4 @@
+import { realpathSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 
@@ -32,7 +33,7 @@ const QWEN_EXTENSION_INSTALL_FILE = ".qwen-extension-install.json";
 const QWEN_EXTENSION_ENABLEMENT_FILE = "extension-enablement.json";
 
 function defaultQwenHome() {
-  return path.join(os.homedir(), ".qwen");
+  return process.env.QWEN_HOME ?? path.join(os.homedir(), ".qwen");
 }
 
 function ensureLeadingAndTrailingSlash(dirPath) {
@@ -60,14 +61,44 @@ function isExtensionEnabled(enablementConfig, extensionName, workspace) {
   let enabled = true;
   const allOverrides = extensionConfig?.overrides ?? [];
   const lexicalPath = ensureLeadingAndTrailingSlash(workspace);
+  let canonicalPath = lexicalPath;
+  try { canonicalPath = ensureLeadingAndTrailingSlash(realpathSync.native(path.resolve(workspace))); } catch {}
   for (const rule of allOverrides) {
-    if (overrideMatchesPath(rule, lexicalPath)) {
+    if (overrideMatchesPath(rule, lexicalPath) || overrideMatchesPath(rule, canonicalPath)) {
       enabled = !rule.startsWith("!");
     }
   }
   return enabled;
 }
 
+function flattenSettingsHooks(settingsHooks) {
+  if (!settingsHooks || typeof settingsHooks !== "object" || Array.isArray(settingsHooks)) return [];
+  const items = [];
+  for (const [, definitions] of Object.entries(settingsHooks)) {
+    if (!Array.isArray(definitions)) continue;
+    for (const def of definitions) {
+      if (!Array.isArray(def?.hooks)) continue;
+      for (const hook of def.hooks) {
+        if (hook?.command) items.push({ command: hook.command, type: hook.type ?? "command" });
+        else if (hook?.url) items.push({ command: hook.url, type: "http" });
+      }
+    }
+  }
+  return items;
+}
+
+function normalizeSettingsMcp(name, config, scope, sourceLabel, evidencePath, rootForEvidence) {
+  return {
+    name,
+    scope,
+    sourceLabel,
+    command: config.command ?? null,
+    args: config.args ?? [],
+    url: config.url ?? config.httpUrl ?? null,
+    evidence: evidence(evidencePath, rootForEvidence),
+  };
+}
+
 function qwenMarkdownRuleSource(workspace, sourceLabel, precedence = "after-provider-rules") {
   return {
     type: "file",
@@ -237,36 +268,23 @@ async function collectQwenPlugins(records, workspace) {
 }
 
 async function collectQwenUserPrimitives(qwenHome) {
-  const mcpPath = path.join(path.dirname(qwenHome), ".mcp.json");
-  const mcps = await pathExists(mcpPath)
-    ? (await collectMcpFromConfig(mcpPath, "user", "User", qwenHome)) ?? []
-    : (await collectMcpItems(qwenHome, "user", "User", qwenHome)) ?? [];
-  const settings = (await readJson(path.join(qwenHome, "settings.json"))) ?? {};
+  const settingsPath = path.join(qwenHome, "settings.json");
+  const settings = (await readJson(settingsPath)) ?? {};
+  const mcps = [];
   if (settings.mcpServers && typeof settings.mcpServers === "object") {
     for (const [name, config] of Object.entries(settings.mcpServers)) {
-      if (!mcps.some((m) => m.name === name)) {
-        mcps.push({
-          name,
-          scope: "user",
-          sourceLabel: "User",
-          command: config.command ?? null,
-          args: config.args ?? [],
-          evidence: evidence(path.join(qwenHome, "settings.json"), qwenHome),
-        });
-      }
+      mcps.push(normalizeSettingsMcp(name, config, "user", "User", settingsPath, qwenHome));
     }
   }
   const hooks = await collectHookItems(qwenHome, "user", "User", qwenHome);
-  if (Array.isArray(settings.hooks)) {
-    for (const hook of settings.hooks) {
-      if (hook?.command && !hooks.some((h) => h.command === hook.command)) {
-        hooks.push({
-          command: hook.command,
-          scope: "user",
-          sourceLabel: "User",
-          evidence: evidence(path.join(qwenHome, "settings.json"), qwenHome),
-        });
-      }
+  for (const hook of flattenSettingsHooks(settings.hooks)) {
+    if (!hooks.some((h) => h.command === hook.command)) {
+      hooks.push({
+        command: hook.command,
+        scope: "user",
+        sourceLabel: "User",
+        evidence: evidence(settingsPath, qwenHome),
+      });
     }
   }
   return {
@@ -282,31 +300,30 @@ async function collectQwenUserPrimitives(qwenHome) {
 async function collectQwenWorkspacePrimitives(workspace) {
   const sourceLabel = await workspaceSourceLabel(workspace);
   const project = await collectWorkspaceRootPrimitives(path.join(workspace, ".qwen"), sourceLabel, workspace);
-  const settings = (await readJson(path.join(workspace, ".qwen", "settings.json"))) ?? {};
+  const projectMcpPath = path.join(workspace, ".mcp.json");
+  if (await pathExists(projectMcpPath)) {
+    const projectMcps = (await collectMcpFromConfig(projectMcpPath, "project", sourceLabel, workspace)) ?? [];
+    for (const mcp of projectMcps) {
+      if (!project.mcps.some((m) => m.name === mcp.name)) project.mcps.push(mcp);
+    }
+  }
+  const settingsPath = path.join(workspace, ".qwen", "settings.json");
+  const settings = (await readJson(settingsPath)) ?? {};
   if (settings.mcpServers && typeof settings.mcpServers === "object") {
     for (const [name, config] of Object.entries(settings.mcpServers)) {
       if (!project.mcps.some((m) => m.name === name)) {
-        project.mcps.push({
-          name,
-          scope: "project",
-          sourceLabel,
-          command: config.command ?? null,
-          args: config.args ?? [],
-          evidence: evidence(path.join(workspace, ".qwen", "settings.json"), workspace),
-        });
+        project.mcps.push(normalizeSettingsMcp(name, config, "project", sourceLabel, settingsPath, workspace));
       }
     }
   }
-  if (Array.isArray(settings.hooks)) {
-    for (const hook of settings.hooks) {
-      if (hook?.command && !project.hooks.some((h) => h.command === hook.command)) {
-        project.hooks.push({
-          command: hook.command,
-          scope: "project",
-          sourceLabel,
-          evidence: evidence(path.join(workspace, ".qwen", "settings.json"), workspace),
-        });
-      }
+  for (const hook of flattenSettingsHooks(settings.hooks)) {
+    if (!project.hooks.some((h) => h.command === hook.command)) {
+      project.hooks.push({
+        command: hook.command,
+        scope: "project",
+        sourceLabel,
+        evidence: evidence(settingsPath, workspace),
+      });
     }
   }
   return {

scripts/session-analysis/platforms/qwen.mjs

@@ -269,7 +269,7 @@ export class QwenSessionAnalyzer extends SessionAnalyzer {
     const since = normalizeCliDate(options.since, false);
     const until = normalizeCliDate(options.until, true);
     const workspace = normalizeWorkspace(options.workspace);
-    const home = path.resolve(expandHome(options.home ?? options.qwenHome ?? options["qwen-home"] ?? "~/.qwen"));
+    const home = path.resolve(expandHome(options.home ?? options.qwenHome ?? options["qwen-home"] ?? process.env.QWEN_HOME ?? "~/.qwen"));
     // Qwen separates config home (QWEN_HOME / ~/.qwen) from runtime data
     // (QWEN_RUNTIME_DIR). Session transcripts live under the runtime dir.
     const runtimeDir = path.resolve(expandHome(

test/agent-customize.test.mjs

@@ -767,10 +767,18 @@ async function makeQwenFixture() {
       ],
     },
   });
-  await writeJson(path.join(root, ".mcp.json"), {
+  await writeJson(path.join(qwenHome, "settings.json"), {
     mcpServers: {
       localMcp: { command: "node", args: ["server.mjs"] },
     },
+    hooks: {
+      PreToolUse: [
+        {
+          matcher: "^Bash$",
+          hooks: [{ type: "command", command: "~/.qwen/hooks/guard-bash.sh" }],
+        },
+      ],
+    },
   });
 
   await writeText(
@@ -1594,7 +1602,7 @@ test("Qwen provider collects user and project MCPs, skills, hooks, and rules", a
       filterManageItems(inventory, { tab: "hooks", scopeKind: "user" })
         .map((item) => item.command)
         .sort(),
-      ["node hooks/audit-delivery.mjs", "~/.qwen/hooks/guard-prompt.sh"],
+      ["node hooks/audit-delivery.mjs", "~/.qwen/hooks/guard-bash.sh", "~/.qwen/hooks/guard-prompt.sh"],
     );
     assert.deepEqual(
       filterManageItems(inventory, { tab: "hooks", scopeKind: "project" }).map((item) => item.command),