@a5c-ai/hooks-adapter-codex 5.1.1-staging.f83d279f5d4c → 5.1.1-staging.fe1aa68f8bc5
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/normalizer.d.ts.map +1 -1
- package/dist/normalizer.js +7 -1
- package/dist/normalizer.js.map +1 -1
- package/dist/session-resolver.d.ts +5 -2
- package/dist/session-resolver.d.ts.map +1 -1
- package/dist/session-resolver.js +16 -3
- package/dist/session-resolver.js.map +1 -1
- package/package.json +2 -2
package/dist/normalizer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizer.d.ts","sourceRoot":"","sources":["../src/normalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,gBAAgB,EAAyB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"normalizer.d.ts","sourceRoot":"","sources":["../src/normalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,gBAAgB,EAAyB,MAAM,4BAA4B,CAAC;AAI1G,oEAAoE;AACpE,eAAO,MAAM,YAAY,UAAU,CAAC;AAKpC,2DAA2D;AAC3D,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEjD;AAED;;;GAGG;AACH,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBhE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAKhF;AAgBD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,OAAO,EACrB,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAC/B,gBAAgB,CA+ClB"}
|
package/dist/normalizer.js
CHANGED
|
@@ -7,6 +7,7 @@ exports.extractSessionId = extractSessionId;
|
|
|
7
7
|
exports.normalizeCodexEvent = normalizeCodexEvent;
|
|
8
8
|
const hooks_adapter_core_1 = require("@a5c-ai/hooks-adapter-core");
|
|
9
9
|
const mappings_1 = require("./mappings");
|
|
10
|
+
const session_resolver_1 = require("./session-resolver");
|
|
10
11
|
/** The default adapter identifier used in all normalized events. */
|
|
11
12
|
exports.ADAPTER_NAME = 'codex';
|
|
12
13
|
/** The mutable adapter name, defaulting to the Codex adapter identity. */
|
|
@@ -74,7 +75,12 @@ function normalizeCodexEvent(rawEventName, stdinPayload, env = {}) {
|
|
|
74
75
|
const parsed = parseStdin(stdinPayload);
|
|
75
76
|
// Enrich env with Codex-specific fields extracted from stdin
|
|
76
77
|
const enrichedEnv = { ...env };
|
|
77
|
-
|
|
78
|
+
// Resolve the session id from the stdin payload AND the environment. Codex
|
|
79
|
+
// frequently invokes hooks with empty stdin (issue #940), so we must fall
|
|
80
|
+
// back to the Codex-native env vars (CODEX_THREAD_ID / CODEX_SESSION_ID, plus
|
|
81
|
+
// AGENT_SESSION_ID / BABYSITTER_SESSION_ID) rather than relying on the stdin
|
|
82
|
+
// payload alone — otherwise the run/session can never be bound.
|
|
83
|
+
const sessionId = (0, session_resolver_1.resolveSessionId)(parsed, env);
|
|
78
84
|
if (sessionId && !enrichedEnv['HOOKS_PROXY_SESSION_ID']) {
|
|
79
85
|
enrichedEnv['HOOKS_PROXY_SESSION_ID'] = sessionId;
|
|
80
86
|
}
|
package/dist/normalizer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizer.js","sourceRoot":"","sources":["../src/normalizer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"normalizer.js","sourceRoot":"","sources":["../src/normalizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,11 @@
|
|
|
8
8
|
* 1. Explicit --session-id CLI flag (handled upstream)
|
|
9
9
|
* 2. Explicit AGENT_SESSION_ID env var
|
|
10
10
|
* 3. Native session_id from stdin payload
|
|
11
|
-
* 4.
|
|
12
|
-
* 5.
|
|
11
|
+
* 4. BABYSITTER_SESSION_ID env var (cross-harness)
|
|
12
|
+
* 5. CODEX_THREAD_ID / CODEX_SESSION_ID env vars (Codex-native; auto-injected
|
|
13
|
+
* by the Codex CLI into every hook, so they are available even when the
|
|
14
|
+
* hook stdin payload is empty — see issue #940)
|
|
15
|
+
* 6. null (no session; caller decides fallback)
|
|
13
16
|
*/
|
|
14
17
|
/**
|
|
15
18
|
* Extract session ID from Codex stdin payload and environment.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-resolver.d.ts","sourceRoot":"","sources":["../src/session-resolver.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"session-resolver.d.ts","sourceRoot":"","sources":["../src/session-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAC/B,MAAM,GAAG,IAAI,CA+Bf;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAG3D"}
|
package/dist/session-resolver.js
CHANGED
|
@@ -9,8 +9,11 @@
|
|
|
9
9
|
* 1. Explicit --session-id CLI flag (handled upstream)
|
|
10
10
|
* 2. Explicit AGENT_SESSION_ID env var
|
|
11
11
|
* 3. Native session_id from stdin payload
|
|
12
|
-
* 4.
|
|
13
|
-
* 5.
|
|
12
|
+
* 4. BABYSITTER_SESSION_ID env var (cross-harness)
|
|
13
|
+
* 5. CODEX_THREAD_ID / CODEX_SESSION_ID env vars (Codex-native; auto-injected
|
|
14
|
+
* by the Codex CLI into every hook, so they are available even when the
|
|
15
|
+
* hook stdin payload is empty — see issue #940)
|
|
16
|
+
* 6. null (no session; caller decides fallback)
|
|
14
17
|
*/
|
|
15
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
19
|
exports.resolveSessionId = resolveSessionId;
|
|
@@ -33,11 +36,21 @@ function resolveSessionId(stdinPayload, env = {}) {
|
|
|
33
36
|
if (typeof native === 'string' && native.length > 0) {
|
|
34
37
|
return native;
|
|
35
38
|
}
|
|
36
|
-
// Priority 3:
|
|
39
|
+
// Priority 3: cross-harness babysitter session id
|
|
40
|
+
const babysitterSessionId = env['BABYSITTER_SESSION_ID'];
|
|
41
|
+
if (typeof babysitterSessionId === 'string' && babysitterSessionId.length > 0) {
|
|
42
|
+
return babysitterSessionId;
|
|
43
|
+
}
|
|
44
|
+
// Priority 4: Codex-native env vars (auto-injected by the Codex CLI into every
|
|
45
|
+
// hook invocation, so they resolve the session even when stdin is empty — #940)
|
|
37
46
|
const codexThreadId = env['CODEX_THREAD_ID'];
|
|
38
47
|
if (typeof codexThreadId === 'string' && codexThreadId.length > 0) {
|
|
39
48
|
return codexThreadId;
|
|
40
49
|
}
|
|
50
|
+
const codexSessionId = env['CODEX_SESSION_ID'];
|
|
51
|
+
if (typeof codexSessionId === 'string' && codexSessionId.length > 0) {
|
|
52
|
+
return codexSessionId;
|
|
53
|
+
}
|
|
41
54
|
return null;
|
|
42
55
|
}
|
|
43
56
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-resolver.js","sourceRoot":"","sources":["../src/session-resolver.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"session-resolver.js","sourceRoot":"","sources":["../src/session-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AASH,4CAkCC;AAMD,4CAGC;AAlDD;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAC9B,YAAqC,EACrC,MAA8B,EAAE;IAEhC,oCAAoC;IACpC,MAAM,QAAQ,GAAG,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACzC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,mDAAmD;IACnD,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC1C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,kDAAkD;IAClD,MAAM,mBAAmB,GAAG,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACzD,IAAI,OAAO,mBAAmB,KAAK,QAAQ,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9E,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,+EAA+E;IAC/E,gFAAgF;IAChF,MAAM,aAAa,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC7C,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClE,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,MAAM,cAAc,GAAG,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC/C,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpE,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,SAAiB;IAChD,gDAAgD;IAChD,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,IAAI,GAAG,CAAC;AACzD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@a5c-ai/hooks-adapter-codex",
|
|
3
|
-
"version": "5.1.1-staging.
|
|
3
|
+
"version": "5.1.1-staging.fe1aa68f8bc5",
|
|
4
4
|
"description": "Codex harness adapter for the hooks-adapter system",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "commonjs",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"test:watch": "vitest"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@a5c-ai/hooks-adapter-core": "5.1.1-staging.
|
|
33
|
+
"@a5c-ai/hooks-adapter-core": "5.1.1-staging.fe1aa68f8bc5"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"rimraf": "^6.0.0",
|