@claudexor/harness-claude 3.5.0 → 3.6.0
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/context-signals.d.ts +4 -1
- package/dist/context-signals.d.ts.map +1 -1
- package/dist/context-signals.js +36 -12
- package/dist/context-signals.js.map +1 -1
- package/dist/parse.js +8 -4
- package/dist/parse.js.map +1 -1
- package/dist/profile.d.ts +6 -3
- package/dist/profile.d.ts.map +1 -1
- package/dist/profile.js +8 -11
- package/dist/profile.js.map +1 -1
- package/dist/retry-signals.d.ts +1 -0
- package/dist/retry-signals.d.ts.map +1 -1
- package/dist/retry-signals.js +33 -0
- package/dist/retry-signals.js.map +1 -1
- package/package.json +5 -5
|
@@ -45,7 +45,10 @@ export declare function claudeTerminalContextEvent(terminalReason: unknown, sess
|
|
|
45
45
|
* - otherwise the markdown `result` is the final message (side_tool rides its
|
|
46
46
|
* WorkReport on the message payload);
|
|
47
47
|
* - a side_tool report with no deliverable text still surfaces (rare).
|
|
48
|
-
* Finality is stamped only for a success result.
|
|
48
|
+
* Finality is stamped only for a success result. A NON-SUCCESS result's text
|
|
49
|
+
* is failure evidence, not answer material (A3 deliverable hygiene): it rides
|
|
50
|
+
* a `status` event — visible in the timeline, typed by the entitlement/error
|
|
51
|
+
* signals alongside — and never a `message` the answer assembly could adopt.
|
|
49
52
|
*/
|
|
50
53
|
export declare function claudeResultMessageEvents(obj: Json, successResult: boolean, sessionId: string, ts: string): HarnessEvent[];
|
|
51
54
|
export declare function claudeSideToolReport(structuredOutput: unknown): unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-signals.d.ts","sourceRoot":"","sources":["../src/context-signals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD;;;;;;GAMG;AACH,KAAK,IAAI,GAAG,GAAG,CAAC;AAMhB;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GACT,YAAY,EAAE,CAkBhB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,YAAY,EAAE,CAkC9F;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CA8BrB;AAED;;;;;;;GAOG;AACH
|
|
1
|
+
{"version":3,"file":"context-signals.d.ts","sourceRoot":"","sources":["../src/context-signals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD;;;;;;GAMG;AACH,KAAK,IAAI,GAAG,GAAG,CAAC;AAMhB;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GACT,YAAY,EAAE,CAkBhB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,YAAY,EAAE,CAkC9F;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CA8BrB;AAED;;;;;;;GAOG;AACH;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,IAAI,EACT,aAAa,EAAE,OAAO,EACtB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GACT,YAAY,EAAE,CAsEhB;AAED,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAWvE"}
|
package/dist/context-signals.js
CHANGED
|
@@ -120,42 +120,66 @@ export function claudeTerminalContextEvent(terminalReason, sessionId, ts) {
|
|
|
120
120
|
* - otherwise the markdown `result` is the final message (side_tool rides its
|
|
121
121
|
* WorkReport on the message payload);
|
|
122
122
|
* - a side_tool report with no deliverable text still surfaces (rare).
|
|
123
|
-
* Finality is stamped only for a success result.
|
|
123
|
+
* Finality is stamped only for a success result. A NON-SUCCESS result's text
|
|
124
|
+
* is failure evidence, not answer material (A3 deliverable hygiene): it rides
|
|
125
|
+
* a `status` event — visible in the timeline, typed by the entitlement/error
|
|
126
|
+
* signals alongside — and never a `message` the answer assembly could adopt.
|
|
124
127
|
*/
|
|
125
128
|
export function claudeResultMessageEvents(obj, successResult, sessionId, ts) {
|
|
126
129
|
const so = obj.structured_output;
|
|
127
130
|
const sideToolReport = claudeSideToolReport(so);
|
|
128
131
|
if (so !== undefined && so !== null && sideToolReport === undefined) {
|
|
132
|
+
if (!successResult) {
|
|
133
|
+
return [
|
|
134
|
+
{
|
|
135
|
+
type: "status",
|
|
136
|
+
session_id: sessionId,
|
|
137
|
+
ts,
|
|
138
|
+
text: JSON.stringify(so),
|
|
139
|
+
payload: { structured_output: true, non_success_result: true },
|
|
140
|
+
},
|
|
141
|
+
];
|
|
142
|
+
}
|
|
129
143
|
return [
|
|
130
144
|
{
|
|
131
145
|
type: "message",
|
|
132
146
|
session_id: sessionId,
|
|
133
147
|
ts,
|
|
134
148
|
text: JSON.stringify(so),
|
|
135
|
-
|
|
149
|
+
final: true,
|
|
136
150
|
payload: {
|
|
137
151
|
structured_output: true,
|
|
138
|
-
|
|
152
|
+
final_source: "structured_output",
|
|
139
153
|
},
|
|
140
154
|
},
|
|
141
155
|
];
|
|
142
156
|
}
|
|
143
157
|
if (typeof obj.result === "string" && obj.result.trim()) {
|
|
158
|
+
if (!successResult) {
|
|
159
|
+
return [
|
|
160
|
+
{
|
|
161
|
+
type: "status",
|
|
162
|
+
session_id: sessionId,
|
|
163
|
+
ts,
|
|
164
|
+
text: obj.result,
|
|
165
|
+
payload: {
|
|
166
|
+
non_success_result: true,
|
|
167
|
+
...(sideToolReport !== undefined ? { work_report_side_tool: sideToolReport } : {}),
|
|
168
|
+
},
|
|
169
|
+
},
|
|
170
|
+
];
|
|
171
|
+
}
|
|
144
172
|
return [
|
|
145
173
|
{
|
|
146
174
|
type: "message",
|
|
147
175
|
session_id: sessionId,
|
|
148
176
|
ts,
|
|
149
177
|
text: obj.result,
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
...(sideToolReport !== undefined ? { work_report_side_tool: sideToolReport } : {}),
|
|
156
|
-
},
|
|
157
|
-
}
|
|
158
|
-
: {}),
|
|
178
|
+
final: true,
|
|
179
|
+
payload: {
|
|
180
|
+
final_source: "result",
|
|
181
|
+
...(sideToolReport !== undefined ? { work_report_side_tool: sideToolReport } : {}),
|
|
182
|
+
},
|
|
159
183
|
},
|
|
160
184
|
];
|
|
161
185
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-signals.js","sourceRoot":"","sources":["../src/context-signals.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAWlE,SAAS,YAAY,CAAC,CAAU;IAC9B,OAAO,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CACzC,GAAS,EACT,SAAiB,EACjB,EAAU;IAEV,MAAM,IAAI,GACR,GAAG,CAAC,gBAAgB,IAAI,OAAO,GAAG,CAAC,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/F,MAAM,OAAO,GAAI,IAAa,CAAC,OAAO,CAAC;IACvC,OAAO;QACL;YACE,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,SAAS;YACrB,EAAE;YACF,OAAO,EAAE;gBACP,IAAI,EAAE,sBAAsB;gBAC5B,KAAK,EAAE,SAAS;gBAChB,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;gBACpE,UAAU,EAAE,YAAY,CAAE,IAAa,CAAC,UAAU,CAAC;aACpD;SACF;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAS,EAAE,SAAiB,EAAE,EAAU;IAC5E,MAAM,IAAI,GACR,GAAG,CAAC,eAAe,IAAI,OAAO,GAAG,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9F,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAE,IAAa,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IACxD,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAE,IAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,MAAM,QAAQ,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACjG,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAE,IAAa,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IACtE,MAAM,WAAW,GACf,aAAa,KAAK,gBAAgB;QAChC,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,aAAa,KAAK,kBAAkB;YACpC,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,IAAI,CAAC;IACb,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAClF,OAAO;QACL;YACE,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,SAAS;YACrB,EAAE;YACF,IAAI,EAAE,qBAAqB,MAAM,CAAC,MAAM,CAAC,EAAE;YAC3C,UAAU,EAAE;gBACV,SAAS,EAAE,QAAQ;gBACnB,cAAc,EAAE,IAAI;gBACpB,GAAG,CAAC,WAAW;oBACb,CAAC,CAAC;wBACE,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC;wBACpC,iBAAiB,EAAE,eAAe;qBACnC;oBACH,CAAC,CAAC,EAAE,CAAC;aACR;YACD,OAAO,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE;SACpC;KACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CACxC,cAAuB,EACvB,SAAiB,EACjB,EAAU;IAEV,IAAI,cAAc,KAAK,iBAAiB,EAAE,CAAC;QACzC,OAAO;YACL,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,SAAS;YACrB,EAAE;YACF,OAAO,EAAE;gBACP,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,iBAAiB;gBACxB,WAAW,EAAE,iBAAiB;gBAC9B,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI;aACjB;SACF,CAAC;IACJ,CAAC;IACD,IAAI,cAAc,KAAK,sBAAsB,EAAE,CAAC;QAC9C,OAAO;YACL,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,SAAS;YACrB,EAAE;YACF,OAAO,EAAE;gBACP,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,iBAAiB;gBACxB,WAAW,EAAE,sBAAsB;gBACnC,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI;aACjB;SACF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH
|
|
1
|
+
{"version":3,"file":"context-signals.js","sourceRoot":"","sources":["../src/context-signals.ts"],"names":[],"mappings":"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"}
|
package/dist/parse.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { nowIso, redactSecrets } from "@claudexor/util";
|
|
2
2
|
import { claudeCompactBoundaryEvents, claudeRateLimitEvents, claudeResultMessageEvents, claudeTerminalContextEvent, } from "./context-signals.js";
|
|
3
3
|
import { requiredMcpStartupReceipts } from "./required-mcp.js";
|
|
4
|
-
import { claudeApiRetryEvents } from "./retry-signals.js";
|
|
4
|
+
import { claudeApiRetryEvents, claudeEntitlementEvents } from "./retry-signals.js";
|
|
5
5
|
const EDIT_TOOLS = new Set(["Edit", "Write", "MultiEdit", "NotebookEdit"]);
|
|
6
6
|
function toolKindFor(name) {
|
|
7
7
|
if (name === "WebSearch" || name === "WebFetch")
|
|
@@ -343,12 +343,16 @@ function parseClaudeEventStateful(obj, sessionId, pendingTools, deniedTools = ne
|
|
|
343
343
|
// Finality is claimed ONLY for a SUCCESS result (review sol #1); an
|
|
344
344
|
// `is_error:true` result (e.g. terminal_reason:"prompt_too_long", still
|
|
345
345
|
// labeled subtype:"success") carries error prose, not a deliverable — it
|
|
346
|
-
// rides as a
|
|
347
|
-
// final-message emission (structured_output / result /
|
|
348
|
-
// context-signals.ts.
|
|
346
|
+
// rides as a `status` event (A3 deliverable hygiene) and the context event
|
|
347
|
+
// below marks it. The final-message emission (structured_output / result /
|
|
348
|
+
// side_tool) lives in context-signals.ts.
|
|
349
349
|
const successResult = (!obj.subtype || obj.subtype === "success") && obj.is_error !== true;
|
|
350
350
|
for (const ev of claudeResultMessageEvents(obj, successResult, sessionId, ts))
|
|
351
351
|
out.push(ev);
|
|
352
|
+
// A1: type the org-disabled entitlement prose of a non-success result
|
|
353
|
+
// (oauth_org_not_allowed) alongside the status event carrying the prose.
|
|
354
|
+
for (const ev of claudeEntitlementEvents(obj.result, successResult, sessionId, ts))
|
|
355
|
+
out.push(ev);
|
|
352
356
|
if (obj.subtype && obj.subtype !== "success") {
|
|
353
357
|
// `error_max_turns` is NOT a run failure: the turn ended because it hit the
|
|
354
358
|
// configured --max-turns ceiling, with all partial work already streamed
|
package/dist/parse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"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"}
|
package/dist/profile.d.ts
CHANGED
|
@@ -2,9 +2,12 @@ import type { CredentialProfile, CredentialProfileStatus } from "@claudexor/sche
|
|
|
2
2
|
import { type ClaudeProfileRuntimeDeps } from "./index.js";
|
|
3
3
|
/**
|
|
4
4
|
* Canonicalize a profile's isolation locator (INV-135): absolute, trailing
|
|
5
|
-
* separators stripped, symlinks resolved when the dir exists.
|
|
6
|
-
* Claudexor-owned
|
|
7
|
-
*
|
|
5
|
+
* separators stripped, symlinks resolved when the dir exists. Under the
|
|
6
|
+
* unified account model the Claudexor-owned legacy native dir IS a legal row
|
|
7
|
+
* locator — the exact dir the startup migration auto-registers as
|
|
8
|
+
* `claude-default` (bytes never move; Claude Code keys its Keychain item by
|
|
9
|
+
* this exact path). Ordinary ~/.claude stays outside the owned root and is
|
|
10
|
+
* still refused by the shared confinement check.
|
|
8
11
|
*/
|
|
9
12
|
export declare function canonicalProfileConfigDir(locator: string): string;
|
|
10
13
|
/**
|
package/dist/profile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../src/profile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAKpF,OAAO,EAAwB,KAAK,wBAAwB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../src/profile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAKpF,OAAO,EAAwB,KAAK,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEjF;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,OAAO,EAAE,wBAAwB,EACjC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CACN;IACE,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;IAClC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;IACrD,kBAAkB,EAAE,gBAAgB,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAChE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,IAAI,CAAC;CACf,GACD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CACtB,CAiDA;AAED,0DAA0D;AAC1D,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,wBAAwB,EACjC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,uBAAuB,CAAC,CA6ElC"}
|
package/dist/profile.js
CHANGED
|
@@ -1,22 +1,19 @@
|
|
|
1
1
|
import { CredentialProfileStatus as CredentialProfileStatusSchema } from "@claudexor/schema";
|
|
2
2
|
import { nowIso, redactSecrets } from "@claudexor/util";
|
|
3
|
-
import { canonicalIsolationLocator
|
|
3
|
+
import { canonicalIsolationLocator } from "@claudexor/core";
|
|
4
4
|
import { namespacedSecretRefBase } from "@claudexor/secrets";
|
|
5
5
|
import { claudeNativeEnv, BIN } from "./index.js";
|
|
6
|
-
import { defaultNativeClaudeConfigDir } from "./native-home.js";
|
|
7
6
|
/**
|
|
8
7
|
* Canonicalize a profile's isolation locator (INV-135): absolute, trailing
|
|
9
|
-
* separators stripped, symlinks resolved when the dir exists.
|
|
10
|
-
* Claudexor-owned
|
|
11
|
-
*
|
|
8
|
+
* separators stripped, symlinks resolved when the dir exists. Under the
|
|
9
|
+
* unified account model the Claudexor-owned legacy native dir IS a legal row
|
|
10
|
+
* locator — the exact dir the startup migration auto-registers as
|
|
11
|
+
* `claude-default` (bytes never move; Claude Code keys its Keychain item by
|
|
12
|
+
* this exact path). Ordinary ~/.claude stays outside the owned root and is
|
|
13
|
+
* still refused by the shared confinement check.
|
|
12
14
|
*/
|
|
13
15
|
export function canonicalProfileConfigDir(locator) {
|
|
14
|
-
|
|
15
|
-
const defaultDir = normalizeThroughExistingAncestor(defaultNativeClaudeConfigDir());
|
|
16
|
-
if (dir === defaultDir) {
|
|
17
|
-
throw new Error("credential profile config dir must not be the default native Claude dir (profiles are additive; INV-135)");
|
|
18
|
-
}
|
|
19
|
-
return dir;
|
|
16
|
+
return canonicalIsolationLocator(locator, "credential profile config dir");
|
|
20
17
|
}
|
|
21
18
|
/**
|
|
22
19
|
* INV-135 strict profile routing for a run: exactly the profile's transport
|
package/dist/profile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../src/profile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,IAAI,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../src/profile.ts"],"names":[],"mappings":"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"}
|
package/dist/retry-signals.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { HarnessEvent } from "@claudexor/schema";
|
|
2
2
|
/** Translate Claude's native retry frame into the shared typed retry signals. */
|
|
3
3
|
export declare function claudeApiRetryEvents(obj: Record<string, unknown>, sessionId: string, ts: string): HarnessEvent[];
|
|
4
|
+
export declare function claudeEntitlementEvents(resultText: unknown, successResult: boolean, sessionId: string, ts: string): HarnessEvent[];
|
|
4
5
|
//# sourceMappingURL=retry-signals.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-signals.d.ts","sourceRoot":"","sources":["../src/retry-signals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAkBtD,iFAAiF;AACjF,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GACT,YAAY,EAAE,CA6BhB"}
|
|
1
|
+
{"version":3,"file":"retry-signals.d.ts","sourceRoot":"","sources":["../src/retry-signals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAkBtD,iFAAiF;AACjF,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GACT,YAAY,EAAE,CA6BhB;AAoBD,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,OAAO,EACnB,aAAa,EAAE,OAAO,EACtB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GACT,YAAY,EAAE,CAahB"}
|
package/dist/retry-signals.js
CHANGED
|
@@ -43,6 +43,39 @@ export function claudeApiRetryEvents(obj, sessionId, ts) {
|
|
|
43
43
|
}
|
|
44
44
|
return [event];
|
|
45
45
|
}
|
|
46
|
+
/**
|
|
47
|
+
* A1: the org-disabled entitlement failure arrives as PLAIN prose ("Your
|
|
48
|
+
* organization has disabled Claude subscription access for Claude Code · Use
|
|
49
|
+
* an Anthropic API key instead…") on the assistant/result path with exit 1 —
|
|
50
|
+
* never as an api_retry frame — so `claudeRetryCategory` never sees it and the
|
|
51
|
+
* run died as an untyped generic failure (live incident 2026-08-17,
|
|
52
|
+
* run-ea06645118d7). Classify the non-success result's prose into a typed
|
|
53
|
+
* status event with `error_category: "oauth_org_not_allowed"` so downstream
|
|
54
|
+
* consumers (attemptTelemetry → classifyStatusError → capability_refused) see
|
|
55
|
+
* a machine fact instead of prose. The message events themselves keep flowing
|
|
56
|
+
* unchanged (adapter output hygiene is a later phase).
|
|
57
|
+
*
|
|
58
|
+
* `kind: "api_retry"` is the only status kind the frozen schema carries today;
|
|
59
|
+
* consumers read only `error_category`, and a dedicated kind would be a schema
|
|
60
|
+
* change deliberately out of A1 scope.
|
|
61
|
+
*/
|
|
62
|
+
const CLAUDE_ORG_DISABLED_RE = /organization has disabled claude subscription access/i;
|
|
63
|
+
export function claudeEntitlementEvents(resultText, successResult, sessionId, ts) {
|
|
64
|
+
if (successResult || typeof resultText !== "string")
|
|
65
|
+
return [];
|
|
66
|
+
if (!CLAUDE_ORG_DISABLED_RE.test(resultText))
|
|
67
|
+
return [];
|
|
68
|
+
return [
|
|
69
|
+
{
|
|
70
|
+
type: "status",
|
|
71
|
+
session_id: sessionId,
|
|
72
|
+
ts,
|
|
73
|
+
text: `entitlement: ${redactSecrets(resultText).slice(0, 500)}`,
|
|
74
|
+
status: { kind: "api_retry", error_category: "oauth_org_not_allowed" },
|
|
75
|
+
payload: { entitlement_denied: true },
|
|
76
|
+
},
|
|
77
|
+
];
|
|
78
|
+
}
|
|
46
79
|
function nonnegativeSafeIntegerOrUndef(value) {
|
|
47
80
|
return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : undefined;
|
|
48
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-signals.js","sourceRoot":"","sources":["../src/retry-signals.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"retry-signals.js","sourceRoot":"","sources":["../src/retry-signals.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@claudexor/harness-claude",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.6.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Claude Code adapter (claude -p --output-format stream-json).",
|
|
6
6
|
"type": "module",
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
"dist"
|
|
17
17
|
],
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@claudexor/core": "3.
|
|
20
|
-
"@claudexor/schema": "3.
|
|
21
|
-
"@claudexor/
|
|
22
|
-
"@claudexor/
|
|
19
|
+
"@claudexor/core": "3.6.0",
|
|
20
|
+
"@claudexor/schema": "3.6.0",
|
|
21
|
+
"@claudexor/util": "3.6.0",
|
|
22
|
+
"@claudexor/secrets": "3.6.0"
|
|
23
23
|
},
|
|
24
24
|
"repository": {
|
|
25
25
|
"type": "git",
|