codex-skills-mcp 1.5.0-beta.2 → 1.5.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.d.ts +4 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +3 -4
- package/dist/config.js.map +1 -1
- package/dist/lib/deadline.d.ts +3 -2
- package/dist/lib/deadline.d.ts.map +1 -1
- package/dist/lib/deadline.js +3 -2
- package/dist/lib/deadline.js.map +1 -1
- package/dist/openai/settings.d.ts +0 -1
- package/dist/openai/settings.d.ts.map +1 -1
- package/dist/openai/settings.js +7 -12
- package/dist/openai/settings.js.map +1 -1
- package/package.json +1 -1
package/dist/config.d.ts
CHANGED
|
@@ -6,7 +6,6 @@ export interface Config {
|
|
|
6
6
|
githubBranch?: string;
|
|
7
7
|
githubPath: string;
|
|
8
8
|
githubToken?: string;
|
|
9
|
-
useCnMirror: boolean;
|
|
10
9
|
/**
|
|
11
10
|
* Route downloads through the official CN acceleration endpoint
|
|
12
11
|
* (gh.251716.xyz — a self-hosted read-only reverse proxy of
|
|
@@ -34,7 +33,10 @@ export interface Config {
|
|
|
34
33
|
/**
|
|
35
34
|
* Hard absolute deadline for any single download call, in ms, regardless
|
|
36
35
|
* of progress opt-in. Guards against pathological networks hanging a
|
|
37
|
-
* call forever. Default
|
|
36
|
+
* call forever. Default 285s — deliberately UNDER common client request
|
|
37
|
+
* timeouts (e.g. Codex uses 300s) so our structured partial-progress
|
|
38
|
+
* response always arrives BEFORE the client would kill the call.
|
|
39
|
+
* 0 = disabled.
|
|
38
40
|
*/
|
|
39
41
|
hardDeadlineMs: number;
|
|
40
42
|
downloadConcurrency: number;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,MAAM;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,MAAM;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;;;;OAMG;IACH,YAAY,EAAE,OAAO,CAAC;IACtB;;;;;;;OAOG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;;;OAOG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,+EAA+E;IAC/E,WAAW,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,mFAAmF;IACnF,eAAe,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3B;AAuBD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CA6JlD;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IAEtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,EAAE,CAGlE"}
|
package/dist/config.js
CHANGED
|
@@ -38,7 +38,6 @@ export function parseConfig(args) {
|
|
|
38
38
|
if (args.includes(flag))
|
|
39
39
|
explicitCli.add(key);
|
|
40
40
|
};
|
|
41
|
-
markExplicit("--cn-mirror", "cn_mirror");
|
|
42
41
|
markExplicit("--no-official-mirror", "official_mirror");
|
|
43
42
|
markExplicit("--no-hedge", "hedge");
|
|
44
43
|
markExplicit("--soft-deadline-seconds", "soft_deadline_seconds");
|
|
@@ -103,7 +102,6 @@ export function parseConfig(args) {
|
|
|
103
102
|
console.error(`Error: skills_manifest.json not found in ${skillsDir}`);
|
|
104
103
|
process.exit(1);
|
|
105
104
|
}
|
|
106
|
-
const useCnMirror = args.includes("--cn-mirror");
|
|
107
105
|
const useOfficialMirror = !args.includes("--no-official-mirror");
|
|
108
106
|
const hedgeEnabled = !args.includes("--no-hedge");
|
|
109
107
|
// Soft/hard overall call deadlines (seconds; 0 disables). Soft applies
|
|
@@ -111,7 +109,9 @@ export function parseConfig(args) {
|
|
|
111
109
|
const softArg = getArg("--soft-deadline-seconds");
|
|
112
110
|
const softDeadlineMs = softArg !== undefined ? parseInt(softArg, 10) * 1000 : 55 * 1000;
|
|
113
111
|
const hardArg = getArg("--hard-deadline-seconds");
|
|
114
|
-
|
|
112
|
+
// 285s default: just under common 300s client timeouts (e.g. Codex) so
|
|
113
|
+
// our partial response wins the race against the client giving up.
|
|
114
|
+
const hardDeadlineMs = hardArg !== undefined ? parseInt(hardArg, 10) * 1000 : 285 * 1000;
|
|
115
115
|
// Manifest cache TTL (default: 24 hours). --manifest-ttl <seconds> or 0 to disable.
|
|
116
116
|
const ttlArg = getArg("--manifest-ttl");
|
|
117
117
|
const manifestTTL = ttlArg !== undefined ? parseInt(ttlArg, 10) * 1000 : 24 * 60 * 60 * 1000;
|
|
@@ -153,7 +153,6 @@ export function parseConfig(args) {
|
|
|
153
153
|
githubBranch,
|
|
154
154
|
githubPath,
|
|
155
155
|
githubToken,
|
|
156
|
-
useCnMirror,
|
|
157
156
|
useOfficialMirror,
|
|
158
157
|
hedgeEnabled,
|
|
159
158
|
softDeadlineMs,
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/deadline.d.ts
CHANGED
|
@@ -14,8 +14,9 @@
|
|
|
14
14
|
* timeouts. The download KEEPS RUNNING in the background and writes
|
|
15
15
|
* into the cache; the next read_skill call resumes from it and usually
|
|
16
16
|
* returns complete.
|
|
17
|
-
* - hard deadline (default
|
|
18
|
-
* pathological hangs
|
|
17
|
+
* - hard deadline (default 285s, everyone): absolute guard against
|
|
18
|
+
* pathological hangs, and deliberately below common 300s client
|
|
19
|
+
* timeouts (e.g. Codex) so our partial response always lands first.
|
|
19
20
|
*/
|
|
20
21
|
export declare class DownloadDeadlineExceeded extends Error {
|
|
21
22
|
readonly kind: "soft" | "hard";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deadline.d.ts","sourceRoot":"","sources":["../../src/lib/deadline.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"deadline.d.ts","sourceRoot":"","sources":["../../src/lib/deadline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,qBAAa,wBAAyB,SAAQ,KAAK;aAE/B,IAAI,EAAE,MAAM,GAAG,MAAM;aACrB,UAAU,EAAE,MAAM;gBADlB,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,UAAU,EAAE,MAAM;CAKrC;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,EACpB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,GAAG,MAAM,GACpB,OAAO,CAAC,CAAC,CAAC,CAsBZ"}
|
package/dist/lib/deadline.js
CHANGED
|
@@ -14,8 +14,9 @@
|
|
|
14
14
|
* timeouts. The download KEEPS RUNNING in the background and writes
|
|
15
15
|
* into the cache; the next read_skill call resumes from it and usually
|
|
16
16
|
* returns complete.
|
|
17
|
-
* - hard deadline (default
|
|
18
|
-
* pathological hangs
|
|
17
|
+
* - hard deadline (default 285s, everyone): absolute guard against
|
|
18
|
+
* pathological hangs, and deliberately below common 300s client
|
|
19
|
+
* timeouts (e.g. Codex) so our partial response always lands first.
|
|
19
20
|
*/
|
|
20
21
|
export class DownloadDeadlineExceeded extends Error {
|
|
21
22
|
kind;
|
package/dist/lib/deadline.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deadline.js","sourceRoot":"","sources":["../../src/lib/deadline.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"deadline.js","sourceRoot":"","sources":["../../src/lib/deadline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IAE/B;IACA;IAFlB,YACkB,IAAqB,EACrB,UAAkB;QAElC,KAAK,CAAC,YAAY,IAAI,uBAAuB,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QAHhE,SAAI,GAAJ,IAAI,CAAiB;QACrB,eAAU,GAAV,UAAU,CAAQ;QAGlC,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IACzC,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAoB,EACpB,UAAkB,EAClB,IAAqB;IAErB,IAAI,CAAC,UAAU,IAAI,UAAU,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAC;IACpD,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,MAAM,CAAC,IAAI,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;QACzD,CAAC,EAAE,UAAU,CAAC,CAAC;QACf,qEAAqE;QACrE,mEAAmE;QACnE,mCAAmC;QACnC,QAAQ,CAAC,IAAI,CACX,CAAC,KAAK,EAAE,EAAE;YACR,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;YACR,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,iEAAiE;YACjE,gEAAgE;YAChE,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -24,7 +24,6 @@ import type { Config } from "../config.js";
|
|
|
24
24
|
import type { SkillSearchEngine } from "../search/index.js";
|
|
25
25
|
/** Effective (persisted-override) settings shape exposed to the host UI. */
|
|
26
26
|
export interface EffectiveSettings {
|
|
27
|
-
cn_mirror: boolean;
|
|
28
27
|
download_concurrency: number;
|
|
29
28
|
download_timeout_seconds: number;
|
|
30
29
|
manifest_ttl_hours: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/openai/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,4EAA4E;AAC5E,MAAM,WAAW,iBAAiB;IAChC,
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/openai/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,4EAA4E;AAC5E,MAAM,WAAW,iBAAiB;IAChC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,EAAE,MAAM,CAAC;IACjC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAqHD;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEpE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,gBAAgB,EAC5B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,iBAAiB,GAC9B,IAAI,CA+EN"}
|
package/dist/openai/settings.js
CHANGED
|
@@ -27,7 +27,6 @@ const SETTINGS_DIR = resolve(homedir(), ".codex-skills-mcp");
|
|
|
27
27
|
const SETTINGS_PATH = join(SETTINGS_DIR, "settings.json");
|
|
28
28
|
/** Zod schemas per field — single source for validation and type inference. */
|
|
29
29
|
const SCHEMAS = {
|
|
30
|
-
cn_mirror: z.boolean(),
|
|
31
30
|
download_concurrency: z.number().int().min(1).max(64),
|
|
32
31
|
download_timeout_seconds: z.number().int().min(5).max(300),
|
|
33
32
|
manifest_ttl_hours: z.number().int().min(0).max(168),
|
|
@@ -36,11 +35,6 @@ const SCHEMAS = {
|
|
|
36
35
|
const VALUES_SCHEMA = z.object(SCHEMAS).strict();
|
|
37
36
|
/** Field definitions shared by read/update validation (single source). */
|
|
38
37
|
const FIELDS = {
|
|
39
|
-
cn_mirror: {
|
|
40
|
-
schema: SCHEMAS.cn_mirror,
|
|
41
|
-
title: "Use CN mirror (ghproxy)",
|
|
42
|
-
description: "Route remote skill downloads through the China mirror. Only affects remote mode fetching.",
|
|
43
|
-
},
|
|
44
38
|
download_concurrency: {
|
|
45
39
|
schema: SCHEMAS.download_concurrency,
|
|
46
40
|
title: "Download concurrency",
|
|
@@ -66,7 +60,13 @@ function loadPersisted() {
|
|
|
66
60
|
try {
|
|
67
61
|
if (!existsSync(SETTINGS_PATH))
|
|
68
62
|
return {};
|
|
69
|
-
|
|
63
|
+
const data = JSON.parse(readFileSync(SETTINGS_PATH, "utf-8"));
|
|
64
|
+
// Migration: "cn_mirror" was a dead flag (parsed but never consumed by
|
|
65
|
+
// any download logic) removed in 1.5.0-beta.3. Strip it from legacy
|
|
66
|
+
// files so it disappears on the next persist instead of lingering in
|
|
67
|
+
// the settings UI as a misleading no-op toggle.
|
|
68
|
+
delete data.cn_mirror;
|
|
69
|
+
return data;
|
|
70
70
|
}
|
|
71
71
|
catch (err) {
|
|
72
72
|
console.error(`[codex-skills-mcp] Could not read settings file, using defaults: ${err}`);
|
|
@@ -82,7 +82,6 @@ function persist(partial) {
|
|
|
82
82
|
/** Config-derived defaults for every field. */
|
|
83
83
|
function defaultsFromConfig(config) {
|
|
84
84
|
return {
|
|
85
|
-
cn_mirror: config.useCnMirror,
|
|
86
85
|
download_concurrency: config.downloadConcurrency,
|
|
87
86
|
download_timeout_seconds: Math.round(config.downloadTimeout / 1000),
|
|
88
87
|
manifest_ttl_hours: Math.round(config.manifestTTL / 3_600_000),
|
|
@@ -91,7 +90,6 @@ function defaultsFromConfig(config) {
|
|
|
91
90
|
}
|
|
92
91
|
/** Push effective settings back onto the live Config (read at call time). */
|
|
93
92
|
function applyToConfig(config, s) {
|
|
94
|
-
config.useCnMirror = s.cn_mirror;
|
|
95
93
|
config.downloadConcurrency = s.download_concurrency;
|
|
96
94
|
config.downloadTimeout = s.download_timeout_seconds * 1000;
|
|
97
95
|
config.manifestTTL = Math.round(s.manifest_ttl_hours * 3_600_000);
|
|
@@ -105,8 +103,6 @@ function applyToConfig(config, s) {
|
|
|
105
103
|
*/
|
|
106
104
|
function applyPersistedSelective(config, s) {
|
|
107
105
|
const ex = config.explicitCli ?? new Set();
|
|
108
|
-
if (!ex.has("cn_mirror"))
|
|
109
|
-
config.useCnMirror = s.cn_mirror;
|
|
110
106
|
if (!ex.has("download_concurrency"))
|
|
111
107
|
config.downloadConcurrency = s.download_concurrency;
|
|
112
108
|
if (!ex.has("download_timeout_seconds"))
|
|
@@ -154,7 +150,6 @@ export function registerOpenAISettings(server, extensions, config, searchEngine)
|
|
|
154
150
|
kind: "group",
|
|
155
151
|
title: "Downloads & cache",
|
|
156
152
|
items: [
|
|
157
|
-
{ kind: "property", property: "cn_mirror" },
|
|
158
153
|
{ kind: "property", property: "download_concurrency" },
|
|
159
154
|
{ kind: "property", property: "download_timeout_seconds" },
|
|
160
155
|
{ kind: "property", property: "manifest_ttl_hours" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/openai/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/openai/settings.ts"],"names":[],"mappings":"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"}
|