cordisx 0.1.0-beta.42 → 0.1.0-beta.44
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/assets/launcher/native-app-server-protocol.mjs +4 -0
- package/dist/codex-adapter/adapter.d.mts +1 -0
- package/dist/codex-adapter/adapter.mjs +80 -21
- package/dist/codex-adapter/index.d.ts +1 -0
- package/dist/codex-adapter/index.js +5 -2
- package/dist/codex-adapter/native-operation-request-transform.js +4 -4
- package/dist/codex-adapter/native-side-chat-transform.d.ts +3 -0
- package/dist/codex-adapter/native-side-chat-transform.js +68 -0
- package/dist/codex-adapter/native-submission-structure.js +10 -7
- package/dist/codex-adapter/native-submit-orchestrator-transform.js +5 -5
- package/dist/native/native-helper-artifact.json +1 -1
- package/dist/src/cli/injected-host-cleanup.d.ts +1 -0
- package/dist/src/cli/injected-host-cleanup.d.ts.map +1 -1
- package/dist/src/cli/injected-host-cleanup.js +11 -1
- package/dist/src/cli/injected-host-cleanup.js.map +1 -1
- package/dist/src/cli/run-injected-host.d.ts.map +1 -1
- package/dist/src/cli/run-injected-host.js +5 -0
- package/dist/src/cli/run-injected-host.js.map +1 -1
- package/dist/src/launcher/loopback-permissions.d.ts +5 -0
- package/dist/src/launcher/loopback-permissions.d.ts.map +1 -1
- package/dist/src/launcher/loopback-permissions.js +21 -1
- package/dist/src/launcher/loopback-permissions.js.map +1 -1
- package/dist/src/launcher/native-submission-cdp-channel.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-cdp-channel.js +54 -4
- package/dist/src/launcher/native-submission-cdp-channel.js.map +1 -1
- package/dist/src/launcher/native-submission-controller-contracts.d.ts +5 -0
- package/dist/src/launcher/native-submission-controller-contracts.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-controller.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-controller.js +47 -9
- package/dist/src/launcher/native-submission-controller.js.map +1 -1
- package/dist/src/renderer/adapter/native-model-provider-seat.d.ts +5 -3
- package/dist/src/renderer/adapter/native-model-provider-seat.d.ts.map +1 -1
- package/dist/src/renderer/adapter/native-model-provider-seat.js +11 -6
- package/dist/src/renderer/adapter/native-model-provider-seat.js.map +1 -1
- package/dist/src/renderer/install-model-provider-selector.d.ts +1 -1
- package/dist/src/renderer/install-model-provider-selector.d.ts.map +1 -1
- package/dist/src/renderer/install-model-provider-selector.js +65 -11
- package/dist/src/renderer/install-model-provider-selector.js.map +1 -1
- package/dist/src/renderer/model-provider-selector.d.ts +1 -0
- package/dist/src/renderer/model-provider-selector.d.ts.map +1 -1
- package/dist/src/renderer/model-provider-selector.js +1 -0
- package/dist/src/renderer/model-provider-selector.js.map +1 -1
- package/dist/src/renderer/native-composer-submission-router.d.ts +13 -0
- package/dist/src/renderer/native-composer-submission-router.d.ts.map +1 -0
- package/dist/src/renderer/native-composer-submission-router.js +95 -0
- package/dist/src/renderer/native-composer-submission-router.js.map +1 -0
- package/dist/src/renderer/native-model-provider-state.d.ts.map +1 -1
- package/dist/src/renderer/native-model-provider-state.js +1 -0
- package/dist/src/renderer/native-model-provider-state.js.map +1 -1
- package/dist/src/renderer/native-model-provider-transport.d.ts +4 -1
- package/dist/src/renderer/native-model-provider-transport.d.ts.map +1 -1
- package/dist/src/renderer/native-model-provider-transport.js +41 -32
- package/dist/src/renderer/native-model-provider-transport.js.map +1 -1
- package/dist/src/renderer/native-provider-selection-client.d.ts +2 -0
- package/dist/src/renderer/native-provider-selection-client.d.ts.map +1 -1
- package/dist/src/renderer/native-provider-selection-client.js +2 -1
- package/dist/src/renderer/native-provider-selection-client.js.map +1 -1
- package/package.json +1 -1
|
@@ -818,6 +818,10 @@ readLines(control, line => {
|
|
|
818
818
|
return
|
|
819
819
|
}
|
|
820
820
|
}
|
|
821
|
+
// Ephemeral side chats have no rollout to resume. Unsubscribe would destroy
|
|
822
|
+
// the only live session even when the following resume fails.
|
|
823
|
+
const current = await nativeCall('thread/read', { threadId: message.threadId, includeTurns: false })
|
|
824
|
+
if (current?.thread?.ephemeral === true) throw new Error('Ephemeral provider switching requires a new side chat')
|
|
821
825
|
await nativeCall('thread/unsubscribe', { threadId: message.threadId })
|
|
822
826
|
const result = await nativeCall('thread/resume', {
|
|
823
827
|
threadId: message.threadId,
|
|
@@ -5944,10 +5944,14 @@ var ResourcePlan = class {
|
|
|
5944
5944
|
if (node?.type !== "Identifier") throw new Error(`Native capability ${name}: missing local binding`);
|
|
5945
5945
|
return node.name;
|
|
5946
5946
|
}
|
|
5947
|
-
serviceTier(object) {
|
|
5947
|
+
serviceTier(object, context) {
|
|
5948
5948
|
const value = properties(object).get("serviceTier");
|
|
5949
5949
|
if (!value) throw new Error("Native capability serviceTier: missing request field");
|
|
5950
|
-
|
|
5950
|
+
const selectedTier = context === void 0 ? tier : `(${context}.__cordisxServiceTier==='priority'||${context}.__cordisxServiceTier==='default'?${context}.__cordisxServiceTier:${tier})`;
|
|
5951
|
+
this.replace(
|
|
5952
|
+
value,
|
|
5953
|
+
`(${selectedTier}==='priority'?'priority':${selectedTier}==='default'?null:${this.text(value)})`
|
|
5954
|
+
);
|
|
5951
5955
|
}
|
|
5952
5956
|
addConfig(object, token2) {
|
|
5953
5957
|
const value = properties(object).get("config");
|
|
@@ -5994,7 +5998,7 @@ function submitGuard(plan, fn) {
|
|
|
5994
5998
|
), "submit-context");
|
|
5995
5999
|
plan.insert(
|
|
5996
6000
|
context.end - 1,
|
|
5997
|
-
`,...(${decision}.operationToken===void 0?{}:{${carrier}:${decision}.operationToken,...(${JSON.stringify(modelReasoningEfforts)}.includes(${decision}.reasoningEffort)?{${reasoningCarrier}:${decision}.reasoningEffort}:{})})`
|
|
6001
|
+
`,...(${decision}.serviceTier==='priority'||${decision}.serviceTier==='default'?{__cordisxServiceTier:${decision}.serviceTier}:{}),...(${decision}.operationToken===void 0?{}:{${carrier}:${decision}.operationToken,...(${JSON.stringify(modelReasoningEfforts)}.includes(${decision}.reasoningEffort)?{${reasoningCarrier}:${decision}.reasoningEffort}:{})})`
|
|
5998
6002
|
);
|
|
5999
6003
|
plan.capabilities.push("submit-guard");
|
|
6000
6004
|
}
|
|
@@ -6011,7 +6015,7 @@ function draftRequest(plan, fn) {
|
|
|
6011
6015
|
const metadata = properties(request).get("responsesapiClientMetadata");
|
|
6012
6016
|
if (metadata) plan.replace(metadata, config(token2, plan.text(metadata)));
|
|
6013
6017
|
else plan.insert(request.end - 1, `,...(${token2}===void 0?{}:{responsesapiClientMetadata:${config(token2)}})`);
|
|
6014
|
-
plan.serviceTier(request);
|
|
6018
|
+
plan.serviceTier(request, context);
|
|
6015
6019
|
plan.capabilities.push("draft-request");
|
|
6016
6020
|
}
|
|
6017
6021
|
function existingRequest(plan, fn) {
|
|
@@ -6022,7 +6026,7 @@ function existingRequest(plan, fn) {
|
|
|
6022
6026
|
"existing-request"
|
|
6023
6027
|
);
|
|
6024
6028
|
plan.addConfig(request, valid(`${context}.${carrier}`));
|
|
6025
|
-
plan.serviceTier(request);
|
|
6029
|
+
plan.serviceTier(request, context);
|
|
6026
6030
|
plan.capabilities.push("existing-request");
|
|
6027
6031
|
}
|
|
6028
6032
|
function draftConfigForward(plan, fn) {
|
|
@@ -6043,9 +6047,9 @@ function normalizedRequest(plan, fn) {
|
|
|
6043
6047
|
"normalized-request"
|
|
6044
6048
|
);
|
|
6045
6049
|
plan.addConfig(request, valid(`${operation}.request.config?.[${JSON.stringify(TOKEN)}]`));
|
|
6046
|
-
plan.serviceTier(request);
|
|
6050
|
+
plan.serviceTier(request, `(${operation}.context??{})`);
|
|
6047
6051
|
const params = plan.require(fn.body, (n) => n.type === "ObjectExpression" && n !== request && has(n, ["model", "effort", "multiAgentMode", "serviceTier"]), "normalized-params");
|
|
6048
|
-
plan.serviceTier(params);
|
|
6052
|
+
plan.serviceTier(params, `(${operation}.context??{})`);
|
|
6049
6053
|
plan.capabilities.push("normalized-request");
|
|
6050
6054
|
}
|
|
6051
6055
|
function wireRequestInputs(expression, local = false) {
|
|
@@ -6298,7 +6302,7 @@ var NEW_THREAD_REPLACEMENT = `t.elicitationPluginIds.map(e=>({type:\`plugin\`,id
|
|
|
6298
6302
|
var DECLARATION_REPLACEMENT = `j!=null&&c!=null&&!k&&(j.activePermissionProfile={id:c,extends:null},j.runtimeWorkspaceRoots=g);let __cxOperationToken=${token("i")};let M={request:{`;
|
|
6299
6303
|
var REQUEST_REPLACEMENT = `${REQUEST_ANCHOR.replace(
|
|
6300
6304
|
"serviceTier:l",
|
|
6301
|
-
"serviceTier:globalThis.__cordisxNativeServiceTierOverride===`priority`?`priority`:globalThis.__cordisxNativeServiceTierOverride===`default`?null:l"
|
|
6305
|
+
"serviceTier:i.__cordisxServiceTier===`priority`?`priority`:i.__cordisxServiceTier===`default`?null:globalThis.__cordisxNativeServiceTierOverride===`priority`?`priority`:globalThis.__cordisxNativeServiceTierOverride===`default`?null:l"
|
|
6302
6306
|
)}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken}}),`;
|
|
6303
6307
|
var CARRIER = "...(__cxOperationToken===void 0?{}:{__cordisxOperationToken:__cxOperationToken}),";
|
|
6304
6308
|
var RETURN_REPLACEMENT = `config:v,configOverrides:y,${CARRIER}memoryPreferences:p,requiresThreadReferences:`;
|
|
@@ -6360,17 +6364,17 @@ var SERVICE_TIER_OVERRIDE_9275 = "globalThis.__cordisxNativeServiceTierOverride=
|
|
|
6360
6364
|
var NEW_THREAD_DECLARATION_REPLACEMENT_9275 = `additionalDeveloperInstructions:j,requiresThreadReferences:M,__cordisxOperationToken:__cxRawOperationToken}=e;let __cxOperationToken=${tokenValue("__cxRawOperationToken")};if(D===\`projectless\``;
|
|
6361
6365
|
var NEW_THREAD_REQUEST_REPLACEMENT_9275 = NEW_THREAD_REQUEST_ANCHOR_9275.replace(
|
|
6362
6366
|
"serviceTier:g",
|
|
6363
|
-
`serviceTier:${SERVICE_TIER_OVERRIDE_9275}g`
|
|
6367
|
+
`serviceTier:e.__cordisxServiceTier===\`priority\`?\`priority\`:e.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_9275}g`
|
|
6364
6368
|
);
|
|
6365
6369
|
var NEW_THREAD_CONFIG_REPLACEMENT_9275 = `threadSource:T,threadStartKind:E,config:__cxOperationToken===void 0?c:{...c,${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken},...D===\`projectless\`?`;
|
|
6366
6370
|
var EXISTING_THREAD_DECLARATION_REPLACEMENT_9275 = `async function lQt(e,t,n,r,i,a,o){let __cxOperationContext=n.context??{},s=n.request,{inheritThreadSettings:c=!0,useAppServerPermissionDefault:l,usePermissionSelection:u=!1}=__cxOperationContext,__cxOperationToken=${token("__cxOperationContext")},`;
|
|
6367
6371
|
var EXISTING_THREAD_REQUEST_REPLACEMENT_9275 = `${EXISTING_THREAD_REQUEST_ANCHOR_9275.replace(
|
|
6368
6372
|
"serviceTier:Te",
|
|
6369
|
-
`serviceTier:${SERVICE_TIER_OVERRIDE_9275}Te`
|
|
6373
|
+
`serviceTier:__cxOperationContext.__cordisxServiceTier===\`priority\`?\`priority\`:__cxOperationContext.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_9275}Te`
|
|
6370
6374
|
)}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken}}),`;
|
|
6371
6375
|
var EXISTING_THREAD_PARAMS_REPLACEMENT_9275 = EXISTING_THREAD_PARAMS_ANCHOR_9275.replace(
|
|
6372
6376
|
"serviceTier:Te",
|
|
6373
|
-
`serviceTier:${SERVICE_TIER_OVERRIDE_9275}Te`
|
|
6377
|
+
`serviceTier:__cxOperationContext.__cordisxServiceTier===\`priority\`?\`priority\`:__cxOperationContext.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_9275}Te`
|
|
6374
6378
|
);
|
|
6375
6379
|
var FINAL_TURN_DECLARATION_REPLACEMENT_9275 = `function T$t({manager:e,conversationId:t,operation:n,capabilities:r,origin:i,clientUserMessageId:a,createId:o,ownerWindowError:s,onOutcomeUnknown:c,onMessageAdded:l,onInitialTitleRequested:u,readPersistedValue:d},f){let p=n.request,__cxOperationToken=${configToken("p")},{`;
|
|
6376
6380
|
var FINAL_TURN_DISPATCH_REPLACEMENT_9275 = `let n=C.markRequestDispatched?.(),r=Ite(E.request,e.requestClient.getAppServerVersion());__cxOperationToken!==void 0&&(r={...r,config:{...r.config,${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken}});M=e.getConversation(t)?.environmentSelectionEvidence;`;
|
|
@@ -6480,7 +6484,7 @@ promptOverride:ae!=null||ie!=null
|
|
|
6480
6484
|
if(__cxDecision?.allow!==!0)return;
|
|
6481
6485
|
if(__cxDecision.operationToken!==void 0&&(typeof __cxDecision.operationToken!==\`string\`||__cxDecision.operationToken.length<16||__cxDecision.operationToken.length>256||/[\\0\\r\\n]/u.test(__cxDecision.operationToken)))return;
|
|
6482
6486
|
}a();`;
|
|
6483
|
-
var CONTEXT_REPLACEMENT = ";De={...t,...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),threadReferences:n,";
|
|
6487
|
+
var CONTEXT_REPLACEMENT = ";De={...t,...(__cxDecision.serviceTier===`priority`||__cxDecision.serviceTier===`default`?{__cordisxServiceTier:__cxDecision.serviceTier}:{}),...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),threadReferences:n,";
|
|
6484
6488
|
var NATIVE_SUBMIT_ORCHESTRATOR_ACKNOWLEDGEMENT = `globalThis.${MARKER2}===${JSON.stringify(VERSION2)}`;
|
|
6485
6489
|
var NATIVE_SUBMIT_ORCHESTRATOR_FENCE = `(delete globalThis.__cordisxNativeSubmitHook,delete globalThis.${MARKER2},true)`;
|
|
6486
6490
|
function transformNativeSubmitOrchestrator(source) {
|
|
@@ -6523,7 +6527,7 @@ promptOverride:J!=null||se!=null
|
|
|
6523
6527
|
if(__cxDecision?.allow!==!0)return;
|
|
6524
6528
|
if(__cxDecision.operationToken!==void 0&&(typeof __cxDecision.operationToken!==\`string\`||__cxDecision.operationToken.length<16||__cxDecision.operationToken.length>256||/[\\0\\r\\n]/u.test(__cxDecision.operationToken)))return;
|
|
6525
6529
|
}a();`;
|
|
6526
|
-
var CONTEXT_REPLACEMENT_BUILD_9275 = "je={...t,...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),threadReferences:n,";
|
|
6530
|
+
var CONTEXT_REPLACEMENT_BUILD_9275 = "je={...t,...(__cxDecision.serviceTier===`priority`||__cxDecision.serviceTier===`default`?{__cordisxServiceTier:__cxDecision.serviceTier}:{}),...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),threadReferences:n,";
|
|
6527
6531
|
var NATIVE_SUBMIT_ORCHESTRATOR_ACKNOWLEDGEMENT_BUILD_9275 = `globalThis.${MARKER_BUILD_9275}===${JSON.stringify(VERSION_BUILD_9275)}`;
|
|
6528
6532
|
var NATIVE_SUBMIT_ORCHESTRATOR_FENCE_BUILD_9275 = `(delete globalThis.__cordisxNativeSubmitHook,delete globalThis.${MARKER_BUILD_9275},true)`;
|
|
6529
6533
|
function transformNativeSubmitOrchestratorBuild9275(source) {
|
|
@@ -6570,7 +6574,7 @@ promptOverride:oe!=null||ae!=null
|
|
|
6570
6574
|
if(__cxDecision?.allow!==!0)return;
|
|
6571
6575
|
if(__cxDecision.operationToken!==void 0&&(typeof __cxDecision.operationToken!==\`string\`||__cxDecision.operationToken.length<16||__cxDecision.operationToken.length>256||/[\\0\\r\\n]/u.test(__cxDecision.operationToken)))return;
|
|
6572
6576
|
}s();`;
|
|
6573
|
-
var CONTEXT_REPLACEMENT_BUILD_9647 = "Fe={...t,...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),...ue==null?{}:{turnTrigger:ue},artifactFollowupAttributions:je,threadReferences:n,";
|
|
6577
|
+
var CONTEXT_REPLACEMENT_BUILD_9647 = "Fe={...t,...(__cxDecision.serviceTier===`priority`||__cxDecision.serviceTier===`default`?{__cordisxServiceTier:__cxDecision.serviceTier}:{}),...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),...ue==null?{}:{turnTrigger:ue},artifactFollowupAttributions:je,threadReferences:n,";
|
|
6574
6578
|
var SERVICE_TIER_OVERRIDE_BUILD_9647 = "globalThis.__cordisxNativeServiceTierOverride===`priority`?`priority`:globalThis.__cordisxNativeServiceTierOverride===`default`?null:";
|
|
6575
6579
|
var OPERATION_TOKEN_CONFIG_KEY_BUILD_9647 = "cordisx.operation_token";
|
|
6576
6580
|
var VALID_CONTEXT_TOKEN_BUILD_9647 = "typeof t.__cordisxOperationToken===`string`&&t.__cordisxOperationToken.length>=16&&t.__cordisxOperationToken.length<=256&&!/[\\0\\r\\n]/u.test(t.__cordisxOperationToken)?t.__cordisxOperationToken:void 0";
|
|
@@ -6578,12 +6582,12 @@ var VALID_EXISTING_TOKEN_BUILD_9647 = "typeof i.__cordisxOperationToken===`strin
|
|
|
6578
6582
|
var NEW_THREAD_CONTEXT_REPLACEMENT_BUILD_9647 = `t.elicitationPluginIds.map(e=>({type:\`plugin\`,id:e}))});let __cxOperationToken=${VALID_CONTEXT_TOKEN_BUILD_9647};__cxOperationToken!==void 0&&(b={...b,${JSON.stringify(OPERATION_TOKEN_CONFIG_KEY_BUILD_9647)}:__cxOperationToken});let x=Net`;
|
|
6579
6583
|
var NEW_THREAD_REQUEST_REPLACEMENT_BUILD_9647 = NEW_THREAD_REQUEST_ANCHOR_BUILD_9647.replace(
|
|
6580
6584
|
"serviceTier:d",
|
|
6581
|
-
`serviceTier:${SERVICE_TIER_OVERRIDE_BUILD_9647}d`
|
|
6585
|
+
`serviceTier:t.__cordisxServiceTier===\`priority\`?\`priority\`:t.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_BUILD_9647}d`
|
|
6582
6586
|
);
|
|
6583
6587
|
var EXISTING_THREAD_DECLARATION_REPLACEMENT_BUILD_9647 = `let N=f==null||D?null:Ode({config:A,permissionSelection:f,runtimeWorkspaceRoots:_}),__cxOperationToken=${VALID_EXISTING_TOKEN_BUILD_9647},P={request:{`;
|
|
6584
6588
|
var EXISTING_THREAD_REQUEST_REPLACEMENT_BUILD_9647 = `${EXISTING_THREAD_REQUEST_ANCHOR_BUILD_9647.replace(
|
|
6585
6589
|
"serviceTier:l",
|
|
6586
|
-
`serviceTier:${SERVICE_TIER_OVERRIDE_BUILD_9647}l`
|
|
6590
|
+
`serviceTier:i.__cordisxServiceTier===\`priority\`?\`priority\`:i.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_BUILD_9647}l`
|
|
6587
6591
|
)}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(OPERATION_TOKEN_CONFIG_KEY_BUILD_9647)}:__cxOperationToken}}),`;
|
|
6588
6592
|
var NATIVE_SUBMIT_ORCHESTRATOR_ACKNOWLEDGEMENT_BUILD_9647 = `globalThis.${MARKER_BUILD_9647}===${JSON.stringify(VERSION_BUILD_9647)}`;
|
|
6589
6593
|
var NATIVE_SUBMIT_ORCHESTRATOR_FENCE_BUILD_9647 = `(delete globalThis.__cordisxNativeSubmitHook,delete globalThis.${MARKER_BUILD_9647},true)`;
|
|
@@ -6996,8 +7000,61 @@ function discoverNativeAccountCapability(resource) {
|
|
|
6996
7000
|
return discoverNativeAccountCapabilityFromSyntax(resource, parseNativeSource(resource.source));
|
|
6997
7001
|
}
|
|
6998
7002
|
|
|
6999
|
-
// src/native-
|
|
7003
|
+
// src/native-side-chat-transform.ts
|
|
7000
7004
|
import { createHash as createHash5 } from "node:crypto";
|
|
7005
|
+
var isTrue = (node) => literal2(node) === true || node?.type === "UnaryExpression" && node.operator === "!" && literal2(node.argument) === 0;
|
|
7006
|
+
function nativeSideChatTransforms(resources) {
|
|
7007
|
+
return resources.flatMap((resource) => {
|
|
7008
|
+
if (!resource.source.includes("sideConversationParentNavigationPath") || !resource.source.includes("attachToSource")) return [];
|
|
7009
|
+
const candidates = [];
|
|
7010
|
+
const declarations = [];
|
|
7011
|
+
visitSyntax(parseNativeSource(resource.source), (node) => {
|
|
7012
|
+
if (node.type === "VariableDeclarator") declarations.push(node);
|
|
7013
|
+
if (node.type !== "ObjectExpression") return;
|
|
7014
|
+
const fields = properties(node);
|
|
7015
|
+
if (!isTrue(fields.get("sideConversation")) || !fields.has("sourceConversationId") || !fields.has("sideConversationParentNavigationPath") || !fields.has("developerInstructions")) return;
|
|
7016
|
+
const branch = node.properties.filter((property) => {
|
|
7017
|
+
if (property.type !== "SpreadElement" || property.argument.type !== "ConditionalExpression") return false;
|
|
7018
|
+
const yes = properties(property.argument.consequent);
|
|
7019
|
+
const no = properties(property.argument.alternate);
|
|
7020
|
+
return isTrue(yes.get("attachToSource")) && isTrue(no.get("ephemeral"));
|
|
7021
|
+
});
|
|
7022
|
+
if (branch.length === 1) candidates.push(branch[0].argument.test);
|
|
7023
|
+
});
|
|
7024
|
+
if (candidates.length === 0) return [];
|
|
7025
|
+
if (candidates.length !== 1) throw new Error("Native attached side chat creation is ambiguous");
|
|
7026
|
+
const test = candidates[0];
|
|
7027
|
+
if (test.type !== "Identifier") throw new Error("Native attached side chat gate changed");
|
|
7028
|
+
const declarationsForGate = declarations.filter(
|
|
7029
|
+
(node) => node.id.type === "Identifier" && node.id.name === test.name && node.init?.type === "LogicalExpression" && node.init.operator === "&&" && resource.source.slice(node.init.left.start, node.init.left.end).includes("persistentSideChats")
|
|
7030
|
+
);
|
|
7031
|
+
if (declarationsForGate.length !== 1) throw new Error("Native attached side chat capability gate is ambiguous");
|
|
7032
|
+
const flag = declarationsForGate[0].init.right;
|
|
7033
|
+
const sha256 = createHash5("sha256").update(resource.source).digest("hex");
|
|
7034
|
+
const marker2 = `__cordisxNativeAttachedSideChat_${sha256.slice(0, 16)}`;
|
|
7035
|
+
const source = applySourceEdits(resource.source, [{ start: flag.start, end: flag.end, text: "true" }]) + `
|
|
7036
|
+
;globalThis.${marker2}=true;`;
|
|
7037
|
+
return [fixedNativeTransform({
|
|
7038
|
+
url: resource.url,
|
|
7039
|
+
sha256,
|
|
7040
|
+
requiredForDocumentReady: false,
|
|
7041
|
+
transform(observed) {
|
|
7042
|
+
if (createHash5("sha256").update(observed).digest("hex") !== sha256) {
|
|
7043
|
+
throw new Error("Native side chat source changed");
|
|
7044
|
+
}
|
|
7045
|
+
return {
|
|
7046
|
+
source,
|
|
7047
|
+
anchorMatches: 1,
|
|
7048
|
+
acknowledgementExpression: `globalThis.${marker2}===true`,
|
|
7049
|
+
fenceExpression: `(delete globalThis.${marker2},true)`
|
|
7050
|
+
};
|
|
7051
|
+
}
|
|
7052
|
+
})];
|
|
7053
|
+
});
|
|
7054
|
+
}
|
|
7055
|
+
|
|
7056
|
+
// src/native-browser-session-transform.ts
|
|
7057
|
+
import { createHash as createHash6 } from "node:crypto";
|
|
7001
7058
|
var marker = "__cordisxNativeBrowserSessionCatchupV1";
|
|
7002
7059
|
function nativeBrowserSessionTransforms(resources) {
|
|
7003
7060
|
const matches = [];
|
|
@@ -7032,7 +7089,7 @@ function nativeBrowserSessionTransforms(resources) {
|
|
|
7032
7089
|
const insertion = `;const __cxBrowserLifetime=globalThis.${marker};const __cxBrowserCaptured=new Set;const __cxBrowserCatchup=(id,state)=>{if(globalThis.${marker}!==__cxBrowserLifetime||__cxBrowserLifetime===void 0)return;if(state==null||${manager}.getStreamRole(id)?.role!=="owner"){__cxBrowserCaptured.delete(id);return}if(__cxBrowserCaptured.has(id))return;__cxBrowserCaptured.add(id);if(__cxBrowserCaptured.size>128)__cxBrowserCaptured.delete(__cxBrowserCaptured.values().next().value);${capture}({conversationId:id})};${manager}.addConversationStateCallback(__cxBrowserCatchup);for(const state of ${manager}.getCachedConversations())__cxBrowserCatchup(state.id,state);`;
|
|
7033
7090
|
return [fixedNativeTransform({
|
|
7034
7091
|
url: resource.url,
|
|
7035
|
-
sha256:
|
|
7092
|
+
sha256: createHash6("sha256").update(resource.source).digest("hex"),
|
|
7036
7093
|
requiredForDocumentReady: false,
|
|
7037
7094
|
transform(source) {
|
|
7038
7095
|
return {
|
|
@@ -7067,7 +7124,8 @@ var bundle = {
|
|
|
7067
7124
|
["accessInputs", "readAccountInfo"],
|
|
7068
7125
|
["accountInfo", "readAccountInfo"],
|
|
7069
7126
|
["create_thread", "argumentsValue", "sourceThreadId", "parentTurnId"],
|
|
7070
|
-
["browser-use-session-route-capture", "addStreamRoleStateCallback"]
|
|
7127
|
+
["browser-use-session-route-capture", "addStreamRoleStateCallback"],
|
|
7128
|
+
["sideConversationParentNavigationPath", "attachToSource"]
|
|
7071
7129
|
],
|
|
7072
7130
|
modules: [
|
|
7073
7131
|
{
|
|
@@ -7076,10 +7134,10 @@ var bundle = {
|
|
|
7076
7134
|
composes: [],
|
|
7077
7135
|
analyze({ resources }) {
|
|
7078
7136
|
const legacy = legacyNativeSubmissionResources(resources);
|
|
7079
|
-
if (legacy) return { transforms: legacy };
|
|
7137
|
+
if (legacy) return { transforms: [...legacy, ...nativeSideChatTransforms(resources)] };
|
|
7080
7138
|
const result = analyzeNativeSubmissionTransforms(resources);
|
|
7081
7139
|
syntaxes.set(resources, result.syntaxByResource);
|
|
7082
|
-
return { transforms: result.transforms.map(fixedNativeTransform) };
|
|
7140
|
+
return { transforms: [...result.transforms.map(fixedNativeTransform), ...nativeSideChatTransforms(resources)] };
|
|
7083
7141
|
}
|
|
7084
7142
|
},
|
|
7085
7143
|
{
|
|
@@ -7176,6 +7234,7 @@ export {
|
|
|
7176
7234
|
nativeAgentTaskTransforms,
|
|
7177
7235
|
nativeBrowserSessionTransforms,
|
|
7178
7236
|
nativeLazyRequestSource,
|
|
7237
|
+
nativeSideChatTransforms,
|
|
7179
7238
|
one,
|
|
7180
7239
|
parseNativeSource,
|
|
7181
7240
|
properties,
|
|
@@ -4,6 +4,7 @@ import { legacyNativeSubmissionResources } from './native-submission-legacy-reso
|
|
|
4
4
|
import { nativeAgentTaskTransforms } from './native-agent-task-transform.js';
|
|
5
5
|
import { discoverNativeAccountCapabilityFromSyntax } from './native-account-structure.js';
|
|
6
6
|
import { parseNativeSource } from './native-source-structure.js';
|
|
7
|
+
import { nativeSideChatTransforms } from './native-side-chat-transform.js';
|
|
7
8
|
import { nativeBrowserSessionTransforms } from './native-browser-session-transform.js';
|
|
8
9
|
const syntaxes = new WeakMap();
|
|
9
10
|
// Kept in lockstep by the independent artifact check, unrelated to Host/Creator versions.
|
|
@@ -24,6 +25,7 @@ export const bundle = {
|
|
|
24
25
|
['accountInfo', 'readAccountInfo'],
|
|
25
26
|
['create_thread', 'argumentsValue', 'sourceThreadId', 'parentTurnId'],
|
|
26
27
|
['browser-use-session-route-capture', 'addStreamRoleStateCallback'],
|
|
28
|
+
['sideConversationParentNavigationPath', 'attachToSource'],
|
|
27
29
|
],
|
|
28
30
|
modules: [
|
|
29
31
|
{
|
|
@@ -33,10 +35,10 @@ export const bundle = {
|
|
|
33
35
|
analyze({ resources }) {
|
|
34
36
|
const legacy = legacyNativeSubmissionResources(resources);
|
|
35
37
|
if (legacy)
|
|
36
|
-
return { transforms: legacy };
|
|
38
|
+
return { transforms: [...legacy, ...nativeSideChatTransforms(resources)] };
|
|
37
39
|
const result = analyzeNativeSubmissionTransforms(resources);
|
|
38
40
|
syntaxes.set(resources, result.syntaxByResource);
|
|
39
|
-
return { transforms: result.transforms.map(fixedNativeTransform) };
|
|
41
|
+
return { transforms: [...result.transforms.map(fixedNativeTransform), ...nativeSideChatTransforms(resources)] };
|
|
40
42
|
},
|
|
41
43
|
},
|
|
42
44
|
{
|
|
@@ -92,3 +94,4 @@ export * from './native-source-bindings.js';
|
|
|
92
94
|
export * from './native-lazy-wire-request.js';
|
|
93
95
|
export * from './native-operation-request-transform.js';
|
|
94
96
|
export * from './native-submit-orchestrator-transform.js';
|
|
97
|
+
export * from './native-side-chat-transform.js';
|
|
@@ -28,7 +28,7 @@ function configToken(context) {
|
|
|
28
28
|
}
|
|
29
29
|
const NEW_THREAD_REPLACEMENT = `t.elicitationPluginIds.map(e=>({type:\`plugin\`,id:e}))});let __cxOperationToken=${token('t')};__cxOperationToken!==void 0&&(y={...y,${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken});let b=uMs`;
|
|
30
30
|
const DECLARATION_REPLACEMENT = `j!=null&&c!=null&&!k&&(j.activePermissionProfile={id:c,extends:null},j.runtimeWorkspaceRoots=g);let __cxOperationToken=${token('i')};let M={request:{`;
|
|
31
|
-
const REQUEST_REPLACEMENT = `${REQUEST_ANCHOR.replace('serviceTier:l', 'serviceTier:globalThis.__cordisxNativeServiceTierOverride===`priority`?`priority`:globalThis.__cordisxNativeServiceTierOverride===`default`?null:l')}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken}}),`;
|
|
31
|
+
const REQUEST_REPLACEMENT = `${REQUEST_ANCHOR.replace('serviceTier:l', 'serviceTier:i.__cordisxServiceTier===`priority`?`priority`:i.__cordisxServiceTier===`default`?null:globalThis.__cordisxNativeServiceTierOverride===`priority`?`priority`:globalThis.__cordisxNativeServiceTierOverride===`default`?null:l')}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken}}),`;
|
|
32
32
|
const CARRIER = '...(__cxOperationToken===void 0?{}:{__cordisxOperationToken:__cxOperationToken}),';
|
|
33
33
|
const RETURN_REPLACEMENT = `config:v,configOverrides:y,${CARRIER}memoryPreferences:p,requiresThreadReferences:`;
|
|
34
34
|
const CREATE_DECLARATION_REPLACEMENT = 'config:a,configOverrides:o,__cordisxOperationToken:__cxOperationToken,input:s,toolOutput:c,';
|
|
@@ -93,11 +93,11 @@ const MARKER_9275 = '__cordisxNativeOperationRequestTransformBuild9275V1';
|
|
|
93
93
|
const VERSION_9275 = 'app-initial-4d7ea7f81c2d:normalized-operation-request-v1';
|
|
94
94
|
const SERVICE_TIER_OVERRIDE_9275 = 'globalThis.__cordisxNativeServiceTierOverride===`priority`?`priority`:globalThis.__cordisxNativeServiceTierOverride===`default`?null:';
|
|
95
95
|
const NEW_THREAD_DECLARATION_REPLACEMENT_9275 = `additionalDeveloperInstructions:j,requiresThreadReferences:M,__cordisxOperationToken:__cxRawOperationToken}=e;let __cxOperationToken=${tokenValue('__cxRawOperationToken')};if(D===\`projectless\``;
|
|
96
|
-
const NEW_THREAD_REQUEST_REPLACEMENT_9275 = NEW_THREAD_REQUEST_ANCHOR_9275.replace('serviceTier:g', `serviceTier:${SERVICE_TIER_OVERRIDE_9275}g`);
|
|
96
|
+
const NEW_THREAD_REQUEST_REPLACEMENT_9275 = NEW_THREAD_REQUEST_ANCHOR_9275.replace('serviceTier:g', `serviceTier:e.__cordisxServiceTier===\`priority\`?\`priority\`:e.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_9275}g`);
|
|
97
97
|
const NEW_THREAD_CONFIG_REPLACEMENT_9275 = `threadSource:T,threadStartKind:E,config:__cxOperationToken===void 0?c:{...c,${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken},...D===\`projectless\`?`;
|
|
98
98
|
const EXISTING_THREAD_DECLARATION_REPLACEMENT_9275 = `async function lQt(e,t,n,r,i,a,o){let __cxOperationContext=n.context??{},s=n.request,{inheritThreadSettings:c=!0,useAppServerPermissionDefault:l,usePermissionSelection:u=!1}=__cxOperationContext,__cxOperationToken=${token('__cxOperationContext')},`;
|
|
99
|
-
const EXISTING_THREAD_REQUEST_REPLACEMENT_9275 = `${EXISTING_THREAD_REQUEST_ANCHOR_9275.replace('serviceTier:Te', `serviceTier:${SERVICE_TIER_OVERRIDE_9275}Te`)}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken}}),`;
|
|
100
|
-
const EXISTING_THREAD_PARAMS_REPLACEMENT_9275 = EXISTING_THREAD_PARAMS_ANCHOR_9275.replace('serviceTier:Te', `serviceTier:${SERVICE_TIER_OVERRIDE_9275}Te`);
|
|
99
|
+
const EXISTING_THREAD_REQUEST_REPLACEMENT_9275 = `${EXISTING_THREAD_REQUEST_ANCHOR_9275.replace('serviceTier:Te', `serviceTier:__cxOperationContext.__cordisxServiceTier===\`priority\`?\`priority\`:__cxOperationContext.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_9275}Te`)}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken}}),`;
|
|
100
|
+
const EXISTING_THREAD_PARAMS_REPLACEMENT_9275 = EXISTING_THREAD_PARAMS_ANCHOR_9275.replace('serviceTier:Te', `serviceTier:__cxOperationContext.__cordisxServiceTier===\`priority\`?\`priority\`:__cxOperationContext.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_9275}Te`);
|
|
101
101
|
const FINAL_TURN_DECLARATION_REPLACEMENT_9275 = `function T$t({manager:e,conversationId:t,operation:n,capabilities:r,origin:i,clientUserMessageId:a,createId:o,ownerWindowError:s,onOutcomeUnknown:c,onMessageAdded:l,onInitialTitleRequested:u,readPersistedValue:d},f){let p=n.request,__cxOperationToken=${configToken('p')},{`;
|
|
102
102
|
const FINAL_TURN_DISPATCH_REPLACEMENT_9275 = `let n=C.markRequestDispatched?.(),r=Ite(E.request,e.requestClient.getAppServerVersion());__cxOperationToken!==void 0&&(r={...r,config:{...r.config,${JSON.stringify(NATIVE_OPERATION_TOKEN_CONFIG_KEY)}:__cxOperationToken}});M=e.getConversation(t)?.environmentSelectionEvidence;`;
|
|
103
103
|
export const NATIVE_OPERATION_REQUEST_ACKNOWLEDGEMENT_9275 = `globalThis.${MARKER_9275}===${JSON.stringify(VERSION_9275)}`;
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { NativeResourceTransform, NativeScriptResource } from './contracts.js';
|
|
2
|
+
/** Reuse native attached side chats: they retain a rollout and support provider resume without copying history. */
|
|
3
|
+
export declare function nativeSideChatTransforms(resources: readonly NativeScriptResource[]): readonly NativeResourceTransform[];
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { fixedNativeTransform } from './fixed-transform.js';
|
|
3
|
+
import { applySourceEdits, literal, parseNativeSource, properties, visitSyntax, } from './native-source-structure.js';
|
|
4
|
+
const isTrue = (node) => literal(node) === true
|
|
5
|
+
|| (node?.type === 'UnaryExpression' && node.operator === '!' && literal(node.argument) === 0);
|
|
6
|
+
/** Reuse native attached side chats: they retain a rollout and support provider resume without copying history. */
|
|
7
|
+
export function nativeSideChatTransforms(resources) {
|
|
8
|
+
return resources.flatMap(resource => {
|
|
9
|
+
if (!resource.source.includes('sideConversationParentNavigationPath') || !resource.source.includes('attachToSource'))
|
|
10
|
+
return [];
|
|
11
|
+
const candidates = [];
|
|
12
|
+
const declarations = [];
|
|
13
|
+
visitSyntax(parseNativeSource(resource.source), node => {
|
|
14
|
+
if (node.type === 'VariableDeclarator')
|
|
15
|
+
declarations.push(node);
|
|
16
|
+
if (node.type !== 'ObjectExpression')
|
|
17
|
+
return;
|
|
18
|
+
const fields = properties(node);
|
|
19
|
+
if (!isTrue(fields.get('sideConversation')) || !fields.has('sourceConversationId')
|
|
20
|
+
|| !fields.has('sideConversationParentNavigationPath') || !fields.has('developerInstructions'))
|
|
21
|
+
return;
|
|
22
|
+
const branch = node.properties.filter((property) => {
|
|
23
|
+
if (property.type !== 'SpreadElement' || property.argument.type !== 'ConditionalExpression')
|
|
24
|
+
return false;
|
|
25
|
+
const yes = properties(property.argument.consequent);
|
|
26
|
+
const no = properties(property.argument.alternate);
|
|
27
|
+
return isTrue(yes.get('attachToSource')) && isTrue(no.get('ephemeral'));
|
|
28
|
+
});
|
|
29
|
+
if (branch.length === 1)
|
|
30
|
+
candidates.push(branch[0].argument.test);
|
|
31
|
+
});
|
|
32
|
+
if (candidates.length === 0)
|
|
33
|
+
return [];
|
|
34
|
+
if (candidates.length !== 1)
|
|
35
|
+
throw new Error('Native attached side chat creation is ambiguous');
|
|
36
|
+
const test = candidates[0];
|
|
37
|
+
if (test.type !== 'Identifier')
|
|
38
|
+
throw new Error('Native attached side chat gate changed');
|
|
39
|
+
const declarationsForGate = declarations.filter(node => node.id.type === 'Identifier' && node.id.name === test.name
|
|
40
|
+
&& node.init?.type === 'LogicalExpression' && node.init.operator === '&&'
|
|
41
|
+
&& resource.source.slice(node.init.left.start, node.init.left.end).includes('persistentSideChats'));
|
|
42
|
+
if (declarationsForGate.length !== 1)
|
|
43
|
+
throw new Error('Native attached side chat capability gate is ambiguous');
|
|
44
|
+
// Enable the native user-facing path while retaining its user action,
|
|
45
|
+
// paginated-parent and negotiated app-server version checks.
|
|
46
|
+
const flag = declarationsForGate[0].init.right;
|
|
47
|
+
const sha256 = createHash('sha256').update(resource.source).digest('hex');
|
|
48
|
+
const marker = `__cordisxNativeAttachedSideChat_${sha256.slice(0, 16)}`;
|
|
49
|
+
const source = applySourceEdits(resource.source, [{ start: flag.start, end: flag.end, text: 'true' }])
|
|
50
|
+
+ `\n;globalThis.${marker}=true;`;
|
|
51
|
+
return [fixedNativeTransform({
|
|
52
|
+
url: resource.url,
|
|
53
|
+
sha256,
|
|
54
|
+
requiredForDocumentReady: false,
|
|
55
|
+
transform(observed) {
|
|
56
|
+
if (createHash('sha256').update(observed).digest('hex') !== sha256) {
|
|
57
|
+
throw new Error('Native side chat source changed');
|
|
58
|
+
}
|
|
59
|
+
return {
|
|
60
|
+
source,
|
|
61
|
+
anchorMatches: 1,
|
|
62
|
+
acknowledgementExpression: `globalThis.${marker}===true`,
|
|
63
|
+
fenceExpression: `(delete globalThis.${marker},true)`,
|
|
64
|
+
};
|
|
65
|
+
},
|
|
66
|
+
})];
|
|
67
|
+
});
|
|
68
|
+
}
|
|
@@ -83,11 +83,14 @@ class ResourcePlan {
|
|
|
83
83
|
throw new Error(`Native capability ${name}: missing local binding`);
|
|
84
84
|
return node.name;
|
|
85
85
|
}
|
|
86
|
-
serviceTier(object) {
|
|
86
|
+
serviceTier(object, context) {
|
|
87
87
|
const value = properties(object).get('serviceTier');
|
|
88
88
|
if (!value)
|
|
89
89
|
throw new Error('Native capability serviceTier: missing request field');
|
|
90
|
-
|
|
90
|
+
const selectedTier = context === undefined
|
|
91
|
+
? tier
|
|
92
|
+
: `(${context}.__cordisxServiceTier==='priority'||${context}.__cordisxServiceTier==='default'?${context}.__cordisxServiceTier:${tier})`;
|
|
93
|
+
this.replace(value, `(${selectedTier}==='priority'?'priority':${selectedTier}==='default'?null:${this.text(value)})`);
|
|
91
94
|
}
|
|
92
95
|
addConfig(object, token) {
|
|
93
96
|
const value = properties(object).get('config');
|
|
@@ -125,7 +128,7 @@ function submitGuard(plan, fn) {
|
|
|
125
128
|
}`);
|
|
126
129
|
const context = plan.require(fn.body, n => n.type === 'ObjectExpression'
|
|
127
130
|
&& has(n, ['threadReferences', 'openingPromptForHistory']) && n.properties.some((p) => p.type === 'SpreadElement'), 'submit-context');
|
|
128
|
-
plan.insert(context.end - 1, `,...(${decision}.operationToken===void 0?{}:{${carrier}:${decision}.operationToken,...(${JSON.stringify(modelReasoningEfforts)}.includes(${decision}.reasoningEffort)?{${reasoningCarrier}:${decision}.reasoningEffort}:{})})`);
|
|
131
|
+
plan.insert(context.end - 1, `,...(${decision}.serviceTier==='priority'||${decision}.serviceTier==='default'?{__cordisxServiceTier:${decision}.serviceTier}:{}),...(${decision}.operationToken===void 0?{}:{${carrier}:${decision}.operationToken,...(${JSON.stringify(modelReasoningEfforts)}.includes(${decision}.reasoningEffort)?{${reasoningCarrier}:${decision}.reasoningEffort}:{})})`);
|
|
129
132
|
plan.capabilities.push('submit-guard');
|
|
130
133
|
}
|
|
131
134
|
function draftRequest(plan, fn) {
|
|
@@ -143,7 +146,7 @@ function draftRequest(plan, fn) {
|
|
|
143
146
|
plan.replace(metadata, config(token, plan.text(metadata)));
|
|
144
147
|
else
|
|
145
148
|
plan.insert(request.end - 1, `,...(${token}===void 0?{}:{responsesapiClientMetadata:${config(token)}})`);
|
|
146
|
-
plan.serviceTier(request);
|
|
149
|
+
plan.serviceTier(request, context);
|
|
147
150
|
plan.capabilities.push('draft-request');
|
|
148
151
|
}
|
|
149
152
|
function existingRequest(plan, fn) {
|
|
@@ -151,7 +154,7 @@ function existingRequest(plan, fn) {
|
|
|
151
154
|
const request = plan.require(fn.body, n => n.type === 'ObjectExpression'
|
|
152
155
|
&& has(n, ['threadId', 'turnTrigger', 'clientUserMessageId', 'input', 'multiAgentMode', 'serviceTier']), 'existing-request');
|
|
153
156
|
plan.addConfig(request, valid(`${context}.${carrier}`));
|
|
154
|
-
plan.serviceTier(request);
|
|
157
|
+
plan.serviceTier(request, context);
|
|
155
158
|
plan.capabilities.push('existing-request');
|
|
156
159
|
}
|
|
157
160
|
function draftConfigForward(plan, fn) {
|
|
@@ -175,10 +178,10 @@ function normalizedRequest(plan, fn) {
|
|
|
175
178
|
const request = plan.require(fn.body, n => n.type === 'ObjectExpression'
|
|
176
179
|
&& has(n, ['input', 'model', 'effort', 'multiAgentMode', 'serviceTier', 'cyberAccessProgram']), 'normalized-request');
|
|
177
180
|
plan.addConfig(request, valid(`${operation}.request.config?.[${JSON.stringify(TOKEN)}]`));
|
|
178
|
-
plan.serviceTier(request);
|
|
181
|
+
plan.serviceTier(request, `(${operation}.context??{})`);
|
|
179
182
|
const params = plan.require(fn.body, n => n.type === 'ObjectExpression' && n !== request
|
|
180
183
|
&& has(n, ['model', 'effort', 'multiAgentMode', 'serviceTier']), 'normalized-params');
|
|
181
|
-
plan.serviceTier(params);
|
|
184
|
+
plan.serviceTier(params, `(${operation}.context??{})`);
|
|
182
185
|
plan.capabilities.push('normalized-request');
|
|
183
186
|
}
|
|
184
187
|
function wireRequestInputs(expression, local = false) {
|
|
@@ -27,7 +27,7 @@ promptOverride:ae!=null||ie!=null
|
|
|
27
27
|
if(__cxDecision?.allow!==!0)return;
|
|
28
28
|
if(__cxDecision.operationToken!==void 0&&(typeof __cxDecision.operationToken!==\`string\`||__cxDecision.operationToken.length<16||__cxDecision.operationToken.length>256||/[\\0\\r\\n]/u.test(__cxDecision.operationToken)))return;
|
|
29
29
|
}a();`;
|
|
30
|
-
const CONTEXT_REPLACEMENT = ';De={...t,...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),threadReferences:n,';
|
|
30
|
+
const CONTEXT_REPLACEMENT = ';De={...t,...(__cxDecision.serviceTier===`priority`||__cxDecision.serviceTier===`default`?{__cordisxServiceTier:__cxDecision.serviceTier}:{}),...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),threadReferences:n,';
|
|
31
31
|
export const NATIVE_SUBMIT_ORCHESTRATOR_ACKNOWLEDGEMENT = `globalThis.${MARKER}===${JSON.stringify(VERSION)}`;
|
|
32
32
|
export const NATIVE_SUBMIT_ORCHESTRATOR_FENCE = `(delete globalThis.__cordisxNativeSubmitHook,delete globalThis.${MARKER},true)`;
|
|
33
33
|
/** Exact-pinned build-8109 transform; source mismatch fails closed. */
|
|
@@ -74,7 +74,7 @@ promptOverride:J!=null||se!=null
|
|
|
74
74
|
if(__cxDecision?.allow!==!0)return;
|
|
75
75
|
if(__cxDecision.operationToken!==void 0&&(typeof __cxDecision.operationToken!==\`string\`||__cxDecision.operationToken.length<16||__cxDecision.operationToken.length>256||/[\\0\\r\\n]/u.test(__cxDecision.operationToken)))return;
|
|
76
76
|
}a();`;
|
|
77
|
-
const CONTEXT_REPLACEMENT_BUILD_9275 = 'je={...t,...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),threadReferences:n,';
|
|
77
|
+
const CONTEXT_REPLACEMENT_BUILD_9275 = 'je={...t,...(__cxDecision.serviceTier===`priority`||__cxDecision.serviceTier===`default`?{__cordisxServiceTier:__cxDecision.serviceTier}:{}),...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),threadReferences:n,';
|
|
78
78
|
export const NATIVE_SUBMIT_ORCHESTRATOR_ACKNOWLEDGEMENT_BUILD_9275 = `globalThis.${MARKER_BUILD_9275}===${JSON.stringify(VERSION_BUILD_9275)}`;
|
|
79
79
|
export const NATIVE_SUBMIT_ORCHESTRATOR_FENCE_BUILD_9275 = `(delete globalThis.__cordisxNativeSubmitHook,delete globalThis.${MARKER_BUILD_9275},true)`;
|
|
80
80
|
/** Exact-pinned build-9275 transform; source mismatch fails closed. */
|
|
@@ -126,15 +126,15 @@ promptOverride:oe!=null||ae!=null
|
|
|
126
126
|
if(__cxDecision?.allow!==!0)return;
|
|
127
127
|
if(__cxDecision.operationToken!==void 0&&(typeof __cxDecision.operationToken!==\`string\`||__cxDecision.operationToken.length<16||__cxDecision.operationToken.length>256||/[\\0\\r\\n]/u.test(__cxDecision.operationToken)))return;
|
|
128
128
|
}s();`;
|
|
129
|
-
const CONTEXT_REPLACEMENT_BUILD_9647 = 'Fe={...t,...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),...ue==null?{}:{turnTrigger:ue},artifactFollowupAttributions:je,threadReferences:n,';
|
|
129
|
+
const CONTEXT_REPLACEMENT_BUILD_9647 = 'Fe={...t,...(__cxDecision.serviceTier===`priority`||__cxDecision.serviceTier===`default`?{__cordisxServiceTier:__cxDecision.serviceTier}:{}),...(__cxDecision.operationToken===void 0?{}:{__cordisxOperationToken:__cxDecision.operationToken}),...ue==null?{}:{turnTrigger:ue},artifactFollowupAttributions:je,threadReferences:n,';
|
|
130
130
|
const SERVICE_TIER_OVERRIDE_BUILD_9647 = 'globalThis.__cordisxNativeServiceTierOverride===`priority`?`priority`:globalThis.__cordisxNativeServiceTierOverride===`default`?null:';
|
|
131
131
|
const OPERATION_TOKEN_CONFIG_KEY_BUILD_9647 = 'cordisx.operation_token';
|
|
132
132
|
const VALID_CONTEXT_TOKEN_BUILD_9647 = 'typeof t.__cordisxOperationToken===`string`&&t.__cordisxOperationToken.length>=16&&t.__cordisxOperationToken.length<=256&&!/[\\0\\r\\n]/u.test(t.__cordisxOperationToken)?t.__cordisxOperationToken:void 0';
|
|
133
133
|
const VALID_EXISTING_TOKEN_BUILD_9647 = 'typeof i.__cordisxOperationToken===`string`&&i.__cordisxOperationToken.length>=16&&i.__cordisxOperationToken.length<=256&&!/[\\0\\r\\n]/u.test(i.__cordisxOperationToken)?i.__cordisxOperationToken:void 0';
|
|
134
134
|
const NEW_THREAD_CONTEXT_REPLACEMENT_BUILD_9647 = `t.elicitationPluginIds.map(e=>({type:\`plugin\`,id:e}))});let __cxOperationToken=${VALID_CONTEXT_TOKEN_BUILD_9647};__cxOperationToken!==void 0&&(b={...b,${JSON.stringify(OPERATION_TOKEN_CONFIG_KEY_BUILD_9647)}:__cxOperationToken});let x=Net`;
|
|
135
|
-
const NEW_THREAD_REQUEST_REPLACEMENT_BUILD_9647 = NEW_THREAD_REQUEST_ANCHOR_BUILD_9647.replace('serviceTier:d', `serviceTier:${SERVICE_TIER_OVERRIDE_BUILD_9647}d`);
|
|
135
|
+
const NEW_THREAD_REQUEST_REPLACEMENT_BUILD_9647 = NEW_THREAD_REQUEST_ANCHOR_BUILD_9647.replace('serviceTier:d', `serviceTier:t.__cordisxServiceTier===\`priority\`?\`priority\`:t.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_BUILD_9647}d`);
|
|
136
136
|
const EXISTING_THREAD_DECLARATION_REPLACEMENT_BUILD_9647 = `let N=f==null||D?null:Ode({config:A,permissionSelection:f,runtimeWorkspaceRoots:_}),__cxOperationToken=${VALID_EXISTING_TOKEN_BUILD_9647},P={request:{`;
|
|
137
|
-
const EXISTING_THREAD_REQUEST_REPLACEMENT_BUILD_9647 = `${EXISTING_THREAD_REQUEST_ANCHOR_BUILD_9647.replace('serviceTier:l', `serviceTier:${SERVICE_TIER_OVERRIDE_BUILD_9647}l`)}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(OPERATION_TOKEN_CONFIG_KEY_BUILD_9647)}:__cxOperationToken}}),`;
|
|
137
|
+
const EXISTING_THREAD_REQUEST_REPLACEMENT_BUILD_9647 = `${EXISTING_THREAD_REQUEST_ANCHOR_BUILD_9647.replace('serviceTier:l', `serviceTier:i.__cordisxServiceTier===\`priority\`?\`priority\`:i.__cordisxServiceTier===\`default\`?null:${SERVICE_TIER_OVERRIDE_BUILD_9647}l`)}...(__cxOperationToken===void 0?{}:{config:{${JSON.stringify(OPERATION_TOKEN_CONFIG_KEY_BUILD_9647)}:__cxOperationToken}}),`;
|
|
138
138
|
export const NATIVE_SUBMIT_ORCHESTRATOR_ACKNOWLEDGEMENT_BUILD_9647 = `globalThis.${MARKER_BUILD_9647}===${JSON.stringify(VERSION_BUILD_9647)}`;
|
|
139
139
|
export const NATIVE_SUBMIT_ORCHESTRATOR_FENCE_BUILD_9647 = `(delete globalThis.__cordisxNativeSubmitHook,delete globalThis.${MARKER_BUILD_9647},true)`;
|
|
140
140
|
/** Exact-pinned build-9647 transform; source mismatch fails closed. */
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export interface InjectedHostCleanup {
|
|
2
2
|
readonly beforeHostTermination: readonly Promise<unknown>[];
|
|
3
3
|
readonly terminateHost?: () => Promise<unknown>;
|
|
4
|
+
readonly recoverAfterHostTermination?: (error: unknown) => unknown | undefined;
|
|
4
5
|
}
|
|
5
6
|
/** Keep CDP alive until renderer and launcher-service cleanup has settled. */
|
|
6
7
|
export declare function settleInjectedHostCleanup(input: InjectedHostCleanup): Promise<readonly PromiseSettledResult<unknown>[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"injected-host-cleanup.d.ts","sourceRoot":"","sources":["../../../src/cli/injected-host-cleanup.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,qBAAqB,EAAE,SAAS,OAAO,CAAC,OAAO,CAAC,EAAE,CAAA;IAC3D,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"injected-host-cleanup.d.ts","sourceRoot":"","sources":["../../../src/cli/injected-host-cleanup.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,qBAAqB,EAAE,SAAS,OAAO,CAAC,OAAO,CAAC,EAAE,CAAA;IAC3D,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IAC/C,QAAQ,CAAC,2BAA2B,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,GAAG,SAAS,CAAA;CAC/E;AAED,8EAA8E;AAC9E,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,mBAAmB,GACzB,OAAO,CAAC,SAAS,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC,CAenD"}
|
|
@@ -4,6 +4,16 @@ export async function settleInjectedHostCleanup(input) {
|
|
|
4
4
|
const hostTermination = input.terminateHost === undefined
|
|
5
5
|
? []
|
|
6
6
|
: await Promise.allSettled([input.terminateHost()]);
|
|
7
|
-
|
|
7
|
+
const recovered = hostTermination[0]?.status === 'fulfilled' && input.recoverAfterHostTermination !== undefined
|
|
8
|
+
? beforeHostTermination.map(result => {
|
|
9
|
+
if (result.status === 'fulfilled')
|
|
10
|
+
return result;
|
|
11
|
+
const remaining = input.recoverAfterHostTermination(result.reason);
|
|
12
|
+
return remaining === undefined
|
|
13
|
+
? { status: 'fulfilled', value: undefined }
|
|
14
|
+
: { status: 'rejected', reason: remaining };
|
|
15
|
+
})
|
|
16
|
+
: beforeHostTermination;
|
|
17
|
+
return [...recovered, ...hostTermination];
|
|
8
18
|
}
|
|
9
19
|
//# sourceMappingURL=injected-host-cleanup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"injected-host-cleanup.js","sourceRoot":"","sources":["../../../src/cli/injected-host-cleanup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"injected-host-cleanup.js","sourceRoot":"","sources":["../../../src/cli/injected-host-cleanup.ts"],"names":[],"mappings":"AAMA,8EAA8E;AAC9E,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,KAA0B;IAE1B,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACnF,MAAM,eAAe,GAAG,KAAK,CAAC,aAAa,KAAK,SAAS;QACvD,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;IACrD,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,WAAW,IAAI,KAAK,CAAC,2BAA2B,KAAK,SAAS;QAC7G,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACnC,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,MAAM,CAAA;YAChD,MAAM,SAAS,GAAG,KAAK,CAAC,2BAA4B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACnE,OAAO,SAAS,KAAK,SAAS;gBAC5B,CAAC,CAAC,EAAE,MAAM,EAAE,WAAoB,EAAE,KAAK,EAAE,SAAS,EAAE;gBACpD,CAAC,CAAC,EAAE,MAAM,EAAE,UAAmB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;QACxD,CAAC,CAAC;QACF,CAAC,CAAC,qBAAqB,CAAA;IACzB,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,eAAe,CAAC,CAAA;AAC3C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-injected-host.d.ts","sourceRoot":"","sources":["../../../src/cli/run-injected-host.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AACpE,OAAO,EAAE,yBAAyB,EAAkB,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAC1G,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAA;AACrF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAA;AAC3F,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,+BAA+B,CAAA;AAC1F,OAAO,EAAE,qCAAqC,EAAE,MAAM,gDAAgD,CAAA;AACtG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAA;AACvF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAA;AAClF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AACnF,OAAO,EACL,8BAA8B,EAG9B,KAAK,oBAAoB,EAK1B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAA;AACrF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAEnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAA;AACjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"run-injected-host.d.ts","sourceRoot":"","sources":["../../../src/cli/run-injected-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { watchAndInject } from '../launcher/cdp.js';
|
|
|
3
3
|
import { acquireCodexProfileLaunchLease, confirmHiddenCodexOwnership, findFreeLoopbackPort, launchCodex, launchCodexHidden, retainProfileLeaseAfterHiddenHostFailure, terminateIsolatedCodex, } from '../launcher/process.js';
|
|
4
4
|
import { supportsOwnedMainInspector } from '../shortcuts/dock.js';
|
|
5
5
|
import { settleInjectedHostCleanup } from './injected-host-cleanup.js';
|
|
6
|
+
import { cleanupErrorAfterOwnedBrowserExit } from '../launcher/loopback-permissions.js';
|
|
6
7
|
import { logHostLifecycle, observeHostExit, waitForAbort, waitForExit, waitForHostExitAfterReadiness, } from './host-lifecycle.js';
|
|
7
8
|
/** Capture only the ephemeral loopback inspector address from our own Host stderr. */
|
|
8
9
|
export function captureMainInspectorUrl(child) {
|
|
@@ -186,6 +187,10 @@ export async function runInjectedHost(input) {
|
|
|
186
187
|
input.signal?.removeEventListener('abort', abort);
|
|
187
188
|
const launchedHost = launched;
|
|
188
189
|
const cleanup = await settleInjectedHostCleanup({
|
|
190
|
+
recoverAfterHostTermination: error => !input.launcher.attach && launchedHost !== undefined
|
|
191
|
+
&& (launchedHost.exitCode !== null || launchedHost.signalCode !== null)
|
|
192
|
+
? cleanupErrorAfterOwnedBrowserExit(error)
|
|
193
|
+
: error,
|
|
189
194
|
beforeHostTermination: [
|
|
190
195
|
watcher,
|
|
191
196
|
...(input.providerFleet === undefined ? [] : [input.providerFleet.close()]),
|