The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 14:45 UTC
fix(server): include managed Claude skills in the skill menu (#26732)
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Grey committed
Nov 14, 2026 at 05:58 UTC
179c032b3f1577049736d9df591b4fd8f62b1902
2 files changed
+90
-10
apps/server/src/provider/Drivers/ClaudeSkills.test.ts
+67
-2
@@ -3,10 +3,19 @@ import { assert, it } from "@effect/vitest";
3
import * as Effect from "effect/Effect";
4
import * as FileSystem from "effect/FileSystem";
5
import * as Path from "effect/Path";
6
+import * as HostProcess from "@t3tools/shared/HostProcess";
7
7
-import { discoverClaudeSkills } from "./ClaudeSkills.ts";
8
+import { discoverClaudeSkills as discoverSkills } from "./ClaudeSkills.ts";
9
import { planClaudeSkillDispatch } from "./ClaudeSkillDispatch.ts";
10
11
+// Windows makes the managed directory fixture-controlled without reading host policy or skills.
12
+const discoverClaudeSkills = (
13
+ ...[config, cwd, environment = {}]: Parameters<typeof discoverSkills>
14
+) =>
15
+ discoverSkills(config, cwd, environment).pipe(
16
+ Effect.provideService(HostProcess.Platform, "win32"),
17
+ );
18
+
19
const writeSkill = Effect.fn(function* (
20
skillsDir: string,
21
directoryName: string,
@@ -688,7 +697,7 @@ it.layer(NodeServices.layer)("discoverClaudeSkills", (it) => {
697
}),
698
);
699
691
- it.effect("prefers user skills on name collisions even with a stray .agents copy", () =>
700
+ it.effect("prefers managed then user skills on collisions, even with a stray .agents copy", () =>
701
Effect.gen(function* () {
702
const fs = yield* FileSystem.FileSystem;
703
const path = yield* Path.Path;
@@ -723,6 +732,62 @@ it.layer(NodeServices.layer)("discoverClaudeSkills", (it) => {
732
description: "User deploy.",
733
},
734
]);
735
+
736
+ const programFiles = path.join(tempDir, "Program Files");
737
+ const programData = path.join(tempDir, "ProgramData");
738
+ yield* writeSkill(
739
+ path.join(programData, "ClaudeCode", ".claude", "skills"),
740
+ "legacy-only",
741
+ "# Legacy skills must not be discovered",
742
+ );
743
+ yield* fs.writeFileString(
744
+ path.join(programData, "ClaudeCode", "managed-settings.json"),
745
+ '{"skillOverrides":{"deploy":"off"}}',
746
+ );
747
+ for (const ProgramFiles of [undefined, "", programFiles]) {
748
+ const legacySkills = yield* discoverClaudeSkills({ homePath: configDir }, workspace, {
749
+ PROGRAMDATA: programData,
750
+ ...(ProgramFiles !== undefined ? { ProgramFiles } : {}),
751
+ });
752
+ assert.deepEqual(
753
+ legacySkills,
754
+ skills.map((skill) => ({ ...skill, enabled: false })),
755
+ );
756
+ }
757
+ yield* writeSkill(
758
+ path.join(programFiles, "ClaudeCode", ".claude", "skills"),
759
+ "deploy",
760
+ ["---", "name: deploy", "description: Managed deploy.", "---"].join("\n"),
761
+ );
762
+ yield* fs.writeFileString(
763
+ path.join(configDir, "settings.json"),
764
+ '{"skillOverrides":{"deploy":"off"}}',
765
+ );
766
+ yield* fs.writeFileString(
767
+ path.join(programFiles, "ClaudeCode", "managed-settings.json"),
768
+ '{"skillOverrides":{"deploy":"on"}}',
769
+ );
770
+ const managedSkills = yield* discoverClaudeSkills({ homePath: configDir }, workspace, {
771
+ ProgramFiles: programFiles,
772
+ PROGRAMDATA: programData,
773
+ });
774
+
775
+ assert.deepEqual(managedSkills, [
776
+ {
777
+ name: "deploy",
778
+ path: path.join(programFiles, "ClaudeCode", ".claude", "skills", "deploy", "SKILL.md"),
779
+ enabled: true,
780
+ scope: "user",
781
+ description: "Managed deploy.",
782
+ },
783
+ ]);
784
+ assert.deepEqual(
785
+ yield* discoverClaudeSkills({ homePath: configDir }, workspace, {
786
+ PROGRAMFILES: ` ${programFiles} `,
787
+ PROGRAMDATA: programData,
788
+ }),
789
+ managedSkills,
790
+ );
791
}),
792
);
793
apps/server/src/provider/Drivers/ClaudeSkills.ts
+23
-8
@@ -106,19 +106,27 @@ function parseSkillFrontmatter(contents: string): SkillFrontmatter {
106
};
107
}
108
109
-function claudeManagedSettingsPath(
109
+// A caller-supplied environment is a plain object, without Windows' case-insensitive keys.
110
+function windowsEnvironmentValue(environment: NodeJS.ProcessEnv, name: string) {
111
+ const key = name.toLowerCase();
112
+ return Object.entries(environment)
113
+ .find(([candidate]) => candidate.toLowerCase() === key)?.[1]
114
+ ?.trim();
115
+}
116
+
117
+function claudeManagedDirectory(
118
path: Path.Path,
119
platform: NodeJS.Platform,
120
environment: NodeJS.ProcessEnv,
121
): string | undefined {
122
if (platform === "darwin") {
115
- return "/Library/Application Support/ClaudeCode/managed-settings.json";
123
+ return "/Library/Application Support/ClaudeCode";
124
}
125
if (platform === "win32") {
118
- const programData = environment.PROGRAMDATA?.trim();
119
- return programData ? path.join(programData, "ClaudeCode", "managed-settings.json") : undefined;
126
+ const programFiles = windowsEnvironmentValue(environment, "ProgramFiles");
127
+ return programFiles ? path.join(programFiles, "ClaudeCode") : undefined;
128
}
121
- return "/etc/claude-code/managed-settings.json";
129
+ return "/etc/claude-code";
130
}
131
132
/** Claude Code settings files, lowest precedence first. */
@@ -130,7 +138,9 @@ function claudeSettingsPaths(
138
environment: NodeJS.ProcessEnv,
139
repositoryRoot?: string,
140
): ReadonlyArray<string> {
133
- const managedPath = claudeManagedSettingsPath(path, platform, environment);
141
+ const managedDirectory = claudeManagedDirectory(path, platform, environment);
142
+ const programData =
143
+ platform === "win32" ? windowsEnvironmentValue(environment, "ProgramData") : undefined;
144
const root = repositoryRoot !== undefined && repositoryRoot !== cwd ? repositoryRoot : undefined;
145
return [
146
path.join(configDirPath, "settings.json"),
@@ -141,7 +151,8 @@ function claudeSettingsPaths(
151
]
152
: []),
153
...(root ? [path.join(root, ".claude", "settings.local.json")] : []),
144
- ...(managedPath ? [managedPath] : []),
154
+ ...(programData ? [path.join(programData, "ClaudeCode", "managed-settings.json")] : []),
155
+ ...(managedDirectory ? [path.join(managedDirectory, "managed-settings.json")] : []),
156
];
157
}
158
@@ -627,7 +638,7 @@ export function claudeLaunchArgDirectories(launchArgs?: string): ReadonlyArray<s
638
return directories;
639
}
640
630
-/** First name wins, matching Claude Code's precedence of user skills over project skills. */
641
+/** First name wins: managed skills, then user skills, then project skills. */
642
export const discoverClaudeSkills = Effect.fn("discoverClaudeSkills")(function* (
643
config: Pick<ClaudeSettings, "homePath"> & Partial<Pick<ClaudeSettings, "launchArgs">>,
644
cwd?: string,
@@ -642,6 +653,7 @@ export const discoverClaudeSkills = Effect.fn("discoverClaudeSkills")(function*
653
cwd,
654
env,
655
);
656
+ const managedDirectory = claudeManagedDirectory(path, yield* HostProcess.Platform, env);
657
// Most installs have no synced folder; skip reading `.claude.json` for them.
658
const hasSyncedPlugins =
659
!syncedPluginsHidden &&
@@ -653,6 +665,9 @@ export const discoverClaudeSkills = Effect.fn("discoverClaudeSkills")(function*
665
: undefined;
666
667
const roots: ReadonlyArray<ClaudeSkillRoot> = [
668
+ ...(managedDirectory
669
+ ? [{ directory: path.join(managedDirectory, ".claude", "skills"), scope: "user" as const }]
670
+ : []),
671
{ directory: path.join(configDirPath, "skills"), scope: "user" },
672
...(cwd ? [{ directory: path.join(cwd, ".claude", "skills"), scope: "project" as const }] : []),
673
...claudeLaunchArgDirectories(config.launchArgs)