@jsonstudio/rcc 0.89.2202 → 0.90.1

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.
Files changed (260) hide show
  1. package/README.md +27 -0
  2. package/dist/build-info.js +2 -2
  3. package/dist/build-info.js.map +1 -1
  4. package/dist/cli/commands/claude.js +1 -0
  5. package/dist/cli/commands/claude.js.map +1 -1
  6. package/dist/cli/commands/codex.js +1 -0
  7. package/dist/cli/commands/codex.js.map +1 -1
  8. package/dist/cli/commands/guardian-daemon.d.ts +2 -0
  9. package/dist/cli/commands/guardian-daemon.js +299 -0
  10. package/dist/cli/commands/guardian-daemon.js.map +1 -0
  11. package/dist/cli/commands/init/camoufox.js +1 -1
  12. package/dist/cli/commands/init/camoufox.js.map +1 -1
  13. package/dist/cli/commands/init.js +15 -1
  14. package/dist/cli/commands/init.js.map +1 -1
  15. package/dist/cli/commands/launcher/types.d.ts +6 -0
  16. package/dist/cli/commands/launcher-kernel.js +456 -109
  17. package/dist/cli/commands/launcher-kernel.js.map +1 -1
  18. package/dist/cli/commands/port.js +28 -8
  19. package/dist/cli/commands/port.js.map +1 -1
  20. package/dist/cli/commands/restart.d.ts +4 -0
  21. package/dist/cli/commands/restart.js +91 -42
  22. package/dist/cli/commands/restart.js.map +1 -1
  23. package/dist/cli/commands/start-types.d.ts +4 -0
  24. package/dist/cli/commands/start.js +112 -68
  25. package/dist/cli/commands/start.js.map +1 -1
  26. package/dist/cli/commands/stop.d.ts +3 -0
  27. package/dist/cli/commands/stop.js +30 -63
  28. package/dist/cli/commands/stop.js.map +1 -1
  29. package/dist/cli/config/init-config.js +15 -1
  30. package/dist/cli/config/init-config.js.map +1 -1
  31. package/dist/cli/config/init-provider-catalog.js +13 -5
  32. package/dist/cli/config/init-provider-catalog.js.map +1 -1
  33. package/dist/cli/guardian/client.d.ts +38 -0
  34. package/dist/cli/guardian/client.js +237 -0
  35. package/dist/cli/guardian/client.js.map +1 -0
  36. package/dist/cli/guardian/paths.d.ts +7 -0
  37. package/dist/cli/guardian/paths.js +13 -0
  38. package/dist/cli/guardian/paths.js.map +1 -0
  39. package/dist/cli/guardian/types.d.ts +30 -0
  40. package/dist/cli/guardian/types.js +2 -0
  41. package/dist/cli/guardian/types.js.map +1 -0
  42. package/dist/cli/register/guardian-daemon-command.d.ts +2 -0
  43. package/dist/cli/register/guardian-daemon-command.js +5 -0
  44. package/dist/cli/register/guardian-daemon-command.js.map +1 -0
  45. package/dist/cli/server/port-utils.js +57 -1
  46. package/dist/cli/server/port-utils.js.map +1 -1
  47. package/dist/cli.js +48 -0
  48. package/dist/cli.js.map +1 -1
  49. package/dist/commands/oauth.js +6 -6
  50. package/dist/commands/oauth.js.map +1 -1
  51. package/dist/commands/provider-update.js +12 -0
  52. package/dist/commands/provider-update.js.map +1 -1
  53. package/dist/config/routecodex-config-loader.js +66 -1
  54. package/dist/config/routecodex-config-loader.js.map +1 -1
  55. package/dist/config/virtual-router-builder.js +18 -0
  56. package/dist/config/virtual-router-builder.js.map +1 -1
  57. package/dist/config/virtual-router-types.js +20 -5
  58. package/dist/config/virtual-router-types.js.map +1 -1
  59. package/dist/daemon-admin-ui/assets/index-C8vP_c5E.js +15 -0
  60. package/dist/daemon-admin-ui/assets/index-DjIoHmNv.css +1 -0
  61. package/dist/daemon-admin-ui/index.html +13 -0
  62. package/dist/docs/daemon-admin-ui.html +328 -57
  63. package/dist/index.d.ts +9 -0
  64. package/dist/index.js +268 -10
  65. package/dist/index.js.map +1 -1
  66. package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.d.ts +1 -0
  67. package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.js +36 -0
  68. package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.js.map +1 -1
  69. package/dist/manager/modules/quota/provider-quota-daemon.events.js +50 -1
  70. package/dist/manager/modules/quota/provider-quota-daemon.events.js.map +1 -1
  71. package/dist/providers/auth/antigravity-user-agent.js +78 -31
  72. package/dist/providers/auth/antigravity-user-agent.js.map +1 -1
  73. package/dist/providers/auth/gemini-cli-userinfo-helper.js +94 -63
  74. package/dist/providers/auth/gemini-cli-userinfo-helper.js.map +1 -1
  75. package/dist/providers/auth/iflow-userinfo-helper.js +1 -1
  76. package/dist/providers/auth/iflow-userinfo-helper.js.map +1 -1
  77. package/dist/providers/auth/oauth-error-message.d.ts +1 -0
  78. package/dist/providers/auth/oauth-error-message.js +44 -0
  79. package/dist/providers/auth/oauth-error-message.js.map +1 -0
  80. package/dist/providers/auth/oauth-lifecycle/error-detection.js +42 -8
  81. package/dist/providers/auth/oauth-lifecycle/error-detection.js.map +1 -1
  82. package/dist/providers/auth/oauth-lifecycle/token-io.d.ts +1 -0
  83. package/dist/providers/auth/oauth-lifecycle/token-io.js +12 -0
  84. package/dist/providers/auth/oauth-lifecycle/token-io.js.map +1 -1
  85. package/dist/providers/auth/oauth-lifecycle.js +502 -87
  86. package/dist/providers/auth/oauth-lifecycle.js.map +1 -1
  87. package/dist/providers/auth/oauth-repair-cooldown.js +2 -7
  88. package/dist/providers/auth/oauth-repair-cooldown.js.map +1 -1
  89. package/dist/providers/auth/oauth-repair-env.js +3 -5
  90. package/dist/providers/auth/oauth-repair-env.js.map +1 -1
  91. package/dist/providers/auth/oauth-utils/error-extraction.js +42 -8
  92. package/dist/providers/auth/oauth-utils/error-extraction.js.map +1 -1
  93. package/dist/providers/auth/qwen-userinfo-helper.js +18 -3
  94. package/dist/providers/auth/qwen-userinfo-helper.js.map +1 -1
  95. package/dist/providers/auth/tokenfile-auth.d.ts +1 -0
  96. package/dist/providers/auth/tokenfile-auth.js +15 -9
  97. package/dist/providers/auth/tokenfile-auth.js.map +1 -1
  98. package/dist/providers/core/config/camoufox-actions.d.ts +31 -0
  99. package/dist/providers/core/config/camoufox-actions.js +461 -0
  100. package/dist/providers/core/config/camoufox-actions.js.map +1 -0
  101. package/dist/providers/core/config/camoufox-launcher.d.ts +3 -0
  102. package/dist/providers/core/config/camoufox-launcher.js +518 -160
  103. package/dist/providers/core/config/camoufox-launcher.js.map +1 -1
  104. package/dist/providers/core/config/oauth-flows.js +6 -44
  105. package/dist/providers/core/config/oauth-flows.js.map +1 -1
  106. package/dist/providers/core/config/provider-oauth-configs.js +51 -7
  107. package/dist/providers/core/config/provider-oauth-configs.js.map +1 -1
  108. package/dist/providers/core/config/service-profiles.js +13 -4
  109. package/dist/providers/core/config/service-profiles.js.map +1 -1
  110. package/dist/providers/core/runtime/http-transport-provider.d.ts +1 -0
  111. package/dist/providers/core/runtime/http-transport-provider.js +60 -1
  112. package/dist/providers/core/runtime/http-transport-provider.js.map +1 -1
  113. package/dist/providers/core/runtime/provider-error-classifier.js +32 -15
  114. package/dist/providers/core/runtime/provider-error-classifier.js.map +1 -1
  115. package/dist/providers/core/runtime/provider-family-profile-utils.js +1 -1
  116. package/dist/providers/core/runtime/provider-family-profile-utils.js.map +1 -1
  117. package/dist/providers/core/runtime/provider-response-postprocessor.js +61 -14
  118. package/dist/providers/core/runtime/provider-response-postprocessor.js.map +1 -1
  119. package/dist/providers/core/strategies/oauth-auth-code-flow.d.ts +1 -0
  120. package/dist/providers/core/strategies/oauth-auth-code-flow.js +124 -19
  121. package/dist/providers/core/strategies/oauth-auth-code-flow.js.map +1 -1
  122. package/dist/providers/core/strategies/oauth-device-flow.js +6 -3
  123. package/dist/providers/core/strategies/oauth-device-flow.js.map +1 -1
  124. package/dist/providers/profile/families/iflow-profile.js +83 -10
  125. package/dist/providers/profile/families/iflow-profile.js.map +1 -1
  126. package/dist/providers/profile/families/qwen-profile.js +203 -0
  127. package/dist/providers/profile/families/qwen-profile.js.map +1 -1
  128. package/dist/scripts/camoufox/launch-auth.mjs +112 -5
  129. package/dist/server/handlers/config-admin-handler.js +9 -2
  130. package/dist/server/handlers/config-admin-handler.js.map +1 -1
  131. package/dist/server/handlers/handler-utils.js +3 -14
  132. package/dist/server/handlers/handler-utils.js.map +1 -1
  133. package/dist/server/handlers/logging.js +3 -4
  134. package/dist/server/handlers/logging.js.map +1 -1
  135. package/dist/server/runtime/http-server/clock-client-reaper.d.ts +1 -0
  136. package/dist/server/runtime/http-server/clock-client-reaper.js +21 -15
  137. package/dist/server/runtime/http-server/clock-client-reaper.js.map +1 -1
  138. package/dist/server/runtime/http-server/clock-client-registry-utils.d.ts +4 -0
  139. package/dist/server/runtime/http-server/clock-client-registry-utils.js +74 -16
  140. package/dist/server/runtime/http-server/clock-client-registry-utils.js.map +1 -1
  141. package/dist/server/runtime/http-server/clock-client-registry.d.ts +15 -0
  142. package/dist/server/runtime/http-server/clock-client-registry.js +300 -6
  143. package/dist/server/runtime/http-server/clock-client-registry.js.map +1 -1
  144. package/dist/server/runtime/http-server/clock-client-routes.js +49 -19
  145. package/dist/server/runtime/http-server/clock-client-routes.js.map +1 -1
  146. package/dist/server/runtime/http-server/clock-daemon-log-throttle.d.ts +16 -0
  147. package/dist/server/runtime/http-server/clock-daemon-log-throttle.js +49 -0
  148. package/dist/server/runtime/http-server/clock-daemon-log-throttle.js.map +1 -1
  149. package/dist/server/runtime/http-server/clock-scope-resolution.d.ts +14 -0
  150. package/dist/server/runtime/http-server/clock-scope-resolution.js +212 -0
  151. package/dist/server/runtime/http-server/clock-scope-resolution.js.map +1 -0
  152. package/dist/server/runtime/http-server/daemon-admin/auth-handler.js +5 -3
  153. package/dist/server/runtime/http-server/daemon-admin/auth-handler.js.map +1 -1
  154. package/dist/server/runtime/http-server/daemon-admin/control-handler.js +104 -15
  155. package/dist/server/runtime/http-server/daemon-admin/control-handler.js.map +1 -1
  156. package/dist/server/runtime/http-server/daemon-admin/credentials-handler.js +2 -2
  157. package/dist/server/runtime/http-server/daemon-admin/credentials-handler.js.map +1 -1
  158. package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.d.ts +24 -0
  159. package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.js +316 -70
  160. package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.js.map +1 -1
  161. package/dist/server/runtime/http-server/daemon-admin/providers-handler.js +190 -1
  162. package/dist/server/runtime/http-server/daemon-admin/providers-handler.js.map +1 -1
  163. package/dist/server/runtime/http-server/daemon-admin/routing-policy.js +18 -29
  164. package/dist/server/runtime/http-server/daemon-admin/routing-policy.js.map +1 -1
  165. package/dist/server/runtime/http-server/daemon-admin/stats-handler.js +2 -0
  166. package/dist/server/runtime/http-server/daemon-admin/stats-handler.js.map +1 -1
  167. package/dist/server/runtime/http-server/daemon-admin-routes.d.ts +8 -1
  168. package/dist/server/runtime/http-server/daemon-admin-routes.js +30 -0
  169. package/dist/server/runtime/http-server/daemon-admin-routes.js.map +1 -1
  170. package/dist/server/runtime/http-server/executor/client-injection-flow.d.ts +14 -0
  171. package/dist/server/runtime/http-server/executor/client-injection-flow.js +287 -0
  172. package/dist/server/runtime/http-server/executor/client-injection-flow.js.map +1 -0
  173. package/dist/server/runtime/http-server/executor/index.d.ts +1 -1
  174. package/dist/server/runtime/http-server/executor/index.js +1 -1
  175. package/dist/server/runtime/http-server/executor/index.js.map +1 -1
  176. package/dist/server/runtime/http-server/executor/provider-response-converter.js +236 -62
  177. package/dist/server/runtime/http-server/executor/provider-response-converter.js.map +1 -1
  178. package/dist/server/runtime/http-server/executor/provider-response-utils.js +5 -0
  179. package/dist/server/runtime/http-server/executor/provider-response-utils.js.map +1 -1
  180. package/dist/server/runtime/http-server/executor/request-executor-core-utils.d.ts +2 -0
  181. package/dist/server/runtime/http-server/executor/request-executor-core-utils.js +60 -0
  182. package/dist/server/runtime/http-server/executor/request-executor-core-utils.js.map +1 -1
  183. package/dist/server/runtime/http-server/executor/request-retry-helpers.js +20 -8
  184. package/dist/server/runtime/http-server/executor/request-retry-helpers.js.map +1 -1
  185. package/dist/server/runtime/http-server/executor/sse-error-handler.d.ts +1 -0
  186. package/dist/server/runtime/http-server/executor/sse-error-handler.js +13 -2
  187. package/dist/server/runtime/http-server/executor/sse-error-handler.js.map +1 -1
  188. package/dist/server/runtime/http-server/executor/usage-aggregator.d.ts +0 -12
  189. package/dist/server/runtime/http-server/executor/usage-aggregator.js +84 -88
  190. package/dist/server/runtime/http-server/executor/usage-aggregator.js.map +1 -1
  191. package/dist/server/runtime/http-server/executor-metadata.js +328 -7
  192. package/dist/server/runtime/http-server/executor-metadata.js.map +1 -1
  193. package/dist/server/runtime/http-server/executor-response.d.ts +1 -0
  194. package/dist/server/runtime/http-server/executor-response.js +52 -50
  195. package/dist/server/runtime/http-server/executor-response.js.map +1 -1
  196. package/dist/server/runtime/http-server/http-server-bootstrap.js +55 -6
  197. package/dist/server/runtime/http-server/http-server-bootstrap.js.map +1 -1
  198. package/dist/server/runtime/http-server/http-server-clock-daemon.d.ts +1 -0
  199. package/dist/server/runtime/http-server/http-server-clock-daemon.js +199 -44
  200. package/dist/server/runtime/http-server/http-server-clock-daemon.js.map +1 -1
  201. package/dist/server/runtime/http-server/http-server-lifecycle.js +4 -4
  202. package/dist/server/runtime/http-server/http-server-lifecycle.js.map +1 -1
  203. package/dist/server/runtime/http-server/hub-shadow-compare.js +1 -1
  204. package/dist/server/runtime/http-server/hub-shadow-compare.js.map +1 -1
  205. package/dist/server/runtime/http-server/index.d.ts +1 -0
  206. package/dist/server/runtime/http-server/index.js +1 -0
  207. package/dist/server/runtime/http-server/index.js.map +1 -1
  208. package/dist/server/runtime/http-server/middleware.js +82 -4
  209. package/dist/server/runtime/http-server/middleware.js.map +1 -1
  210. package/dist/server/runtime/http-server/request-executor.js +26 -7
  211. package/dist/server/runtime/http-server/request-executor.js.map +1 -1
  212. package/dist/server/runtime/http-server/routes.d.ts +2 -1
  213. package/dist/server/runtime/http-server/routes.js +4 -2
  214. package/dist/server/runtime/http-server/routes.js.map +1 -1
  215. package/dist/server/runtime/http-server/session-dir.js +12 -1
  216. package/dist/server/runtime/http-server/session-dir.js.map +1 -1
  217. package/dist/server/runtime/http-server/stats-manager.d.ts +35 -0
  218. package/dist/server/runtime/http-server/stats-manager.js +269 -21
  219. package/dist/server/runtime/http-server/stats-manager.js.map +1 -1
  220. package/dist/server/runtime/http-server/stopmessage-scope-rebind.d.ts +13 -0
  221. package/dist/server/runtime/http-server/stopmessage-scope-rebind.js +168 -0
  222. package/dist/server/runtime/http-server/stopmessage-scope-rebind.js.map +1 -0
  223. package/dist/server/runtime/http-server/tmux-session-probe.d.ts +10 -0
  224. package/dist/server/runtime/http-server/tmux-session-probe.js +97 -0
  225. package/dist/server/runtime/http-server/tmux-session-probe.js.map +1 -1
  226. package/dist/server-lifecycle/port-utils.d.ts +2 -1
  227. package/dist/server-lifecycle/port-utils.js +84 -4
  228. package/dist/server-lifecycle/port-utils.js.map +1 -1
  229. package/dist/token-daemon/index.d.ts +1 -0
  230. package/dist/token-daemon/index.js +17 -12
  231. package/dist/token-daemon/index.js.map +1 -1
  232. package/dist/utils/clock-client-token.d.ts +2 -1
  233. package/dist/utils/clock-client-token.js +52 -8
  234. package/dist/utils/clock-client-token.js.map +1 -1
  235. package/dist/utils/clock-scope-trace.d.ts +11 -0
  236. package/dist/utils/clock-scope-trace.js +41 -0
  237. package/dist/utils/clock-scope-trace.js.map +1 -0
  238. package/dist/utils/llms-engine-shadow.js +1 -1
  239. package/dist/utils/llms-engine-shadow.js.map +1 -1
  240. package/docs/DAEMON_CONTROL_PLANE.md +1 -0
  241. package/docs/ROUTING_POLICY_SCHEMA.md +4 -2
  242. package/docs/daemon-admin-ui.html +328 -57
  243. package/docs/design/servertool-stopmessage-lifecycle.md +109 -0
  244. package/docs/exec-command-guard-policy.example.v1.json +7 -1
  245. package/docs/providers/antigravity-gemini-provider-compat.md +2 -2
  246. package/package.json +23 -6
  247. package/scripts/build-core.mjs +12 -0
  248. package/scripts/camoufox/launch-auth.mjs +112 -5
  249. package/scripts/ci/repo-sanity.mjs +1 -0
  250. package/scripts/cleanup-stale-server-pids.mjs +142 -0
  251. package/scripts/install-global.sh +8 -0
  252. package/scripts/install-verify.mjs +33 -16
  253. package/scripts/run-bg.sh +226 -43
  254. package/scripts/run-fg-gtimeout.sh +158 -14
  255. package/scripts/tests/blackbox-rcc-vs-routecodex-antigravity.mjs +3 -3
  256. package/scripts/tests/ci-jest.mjs +9 -1
  257. package/scripts/triage-errorsamples.mjs +216 -0
  258. package/scripts/verify-codex-error-samples.mjs +92 -15
  259. package/scripts/verify-e2e-toolcall.mjs +12 -1
  260. package/scripts/verify-install-e2e.mjs +69 -28
@@ -1,8 +1,7 @@
1
1
  import { asRecord } from '../provider-utils.js';
2
2
  import { convertProviderResponse as bridgeConvertProviderResponse, createSnapshotRecorder as bridgeCreateSnapshotRecorder } from '../../../../modules/llmswitch/bridge.js';
3
3
  import { applyClientConnectionStateToContext } from '../../../utils/client-connection-state.js';
4
- import { injectClockClientPrompt } from '../clock-client-registry.js';
5
- import { bindClockConversationSession } from './request-retry-helpers.js';
4
+ import { resolveStopMessageClientInjectReadiness, runClientInjectionFlowBeforeReenter } from './client-injection-flow.js';
6
5
  import { extractClientModelId, normalizeProviderResponse } from './provider-response-utils.js';
7
6
  import { isVerboseErrorLoggingEnabled } from './env-config.js';
8
7
  import { extractSseWrapperError } from './sse-error-handler.js';
@@ -15,7 +14,23 @@ const FOLLOWUP_SESSION_HEADER_KEYS = new Set([
15
14
  'anthropicsessionid',
16
15
  'anthropicconversationid',
17
16
  'xroutecodexsessionid',
18
- 'xroutecodexconversationid'
17
+ 'xroutecodexconversationid',
18
+ 'xroutecodexclientdaemonid',
19
+ 'xroutecodexclientdid',
20
+ 'xrccclientdaemonid',
21
+ 'xroutecodexclockdaemonid',
22
+ 'xroutecodexdaemonid',
23
+ 'xrccclockdaemonid',
24
+ 'xroutecodexclienttmuxsessionid',
25
+ 'xrccclienttmuxsessionid',
26
+ 'xroutecodextmuxsessionid',
27
+ 'xrcctmuxsessionid',
28
+ 'xtmuxsessionid',
29
+ 'xroutecodexclientworkdir',
30
+ 'xrccclientworkdir',
31
+ 'xroutecodexworkdir',
32
+ 'xrccworkdir',
33
+ 'xworkdir'
19
34
  ]);
20
35
  function canonicalizeHeaderName(headerName) {
21
36
  return headerName.toLowerCase().replace(/[^a-z0-9]/g, '');
@@ -56,6 +71,24 @@ function extractPreservedSessionToken(headers, field) {
56
71
  }
57
72
  return undefined;
58
73
  }
74
+ function extractPreservedDaemonOrInjectToken(headers, field) {
75
+ if (!headers) {
76
+ return undefined;
77
+ }
78
+ for (const [headerName, headerValue] of Object.entries(headers)) {
79
+ const normalizedName = canonicalizeHeaderName(headerName);
80
+ if (field === 'daemon' && (normalizedName.endsWith('clockdaemonid') || normalizedName.endsWith('daemonid'))) {
81
+ return headerValue;
82
+ }
83
+ if (field === 'tmux' && normalizedName.endsWith('tmuxsessionid')) {
84
+ return headerValue;
85
+ }
86
+ if (field === 'workdir' && normalizedName.endsWith('workdir')) {
87
+ return headerValue;
88
+ }
89
+ }
90
+ return undefined;
91
+ }
59
92
  export async function convertProviderResponseIfNeeded(options, deps) {
60
93
  const body = options.response.body;
61
94
  if (body && typeof body === 'object') {
@@ -68,20 +101,24 @@ export async function convertProviderResponseIfNeeded(options, deps) {
68
101
  error.upstreamCode = wrapperError.errorCode;
69
102
  }
70
103
  error.retryable = wrapperError.retryable;
104
+ if (typeof wrapperError.statusCode === 'number' && Number.isFinite(wrapperError.statusCode)) {
105
+ error.status = wrapperError.statusCode;
106
+ error.statusCode = wrapperError.statusCode;
107
+ }
71
108
  if (isRateLimitLikeError(wrapperError.message, wrapperError.errorCode)) {
72
109
  error.code = 'HTTP_429';
73
110
  error.status = 429;
74
111
  error.statusCode = 429;
75
112
  error.retryable = true;
76
113
  }
77
- else if (wrapperError.retryable) {
114
+ else if (wrapperError.retryable && error.statusCode === undefined) {
78
115
  error.status = 503;
79
116
  error.statusCode = 503;
80
117
  }
81
118
  throw error;
82
119
  }
83
120
  }
84
- if (options.processMode === 'passthrough' && !options.wantsStream) {
121
+ if (options.processMode === 'passthrough' && !options.wantsStream && options.serverToolsEnabled === false) {
85
122
  return options.response;
86
123
  }
87
124
  const entry = (options.entryEndpoint || '').toLowerCase();
@@ -129,6 +166,21 @@ export async function convertProviderResponseIfNeeded(options, deps) {
129
166
  }
130
167
  applyClientConnectionStateToContext(metadataBag, baseContext);
131
168
  const adapterContext = baseContext;
169
+ const stopMessageInjectReadiness = resolveStopMessageClientInjectReadiness(baseContext);
170
+ {
171
+ const rt = asRecord(adapterContext.__rt) ?? {};
172
+ adapterContext.__rt = {
173
+ ...rt,
174
+ stopMessageClientInjectReady: stopMessageInjectReadiness.ready,
175
+ stopMessageClientInjectReason: stopMessageInjectReadiness.reason,
176
+ ...(stopMessageInjectReadiness.sessionScope
177
+ ? { stopMessageClientInjectSessionScope: stopMessageInjectReadiness.sessionScope }
178
+ : {}),
179
+ ...(stopMessageInjectReadiness.tmuxSessionId
180
+ ? { stopMessageClientInjectTmuxSessionId: stopMessageInjectReadiness.tmuxSessionId }
181
+ : {})
182
+ };
183
+ }
132
184
  const hasTargetMetadata = metadataBag &&
133
185
  typeof metadataBag === 'object' &&
134
186
  metadataBag.target &&
@@ -181,46 +233,83 @@ export async function convertProviderResponseIfNeeded(options, deps) {
181
233
  const reenterPipeline = async (reenterOpts) => {
182
234
  const nestedEntry = reenterOpts.entryEndpoint || options.entryEndpoint || entry;
183
235
  const nestedExtra = asRecord(reenterOpts.metadata) ?? {};
184
- const nestedMetadata = {
185
- ...(metadataBag ?? {}),
186
- ...nestedExtra,
187
- entryEndpoint: nestedEntry,
188
- direction: 'request',
189
- stage: 'inbound'
190
- };
191
- try {
192
- const baseRt = asRecord(metadataBag?.__rt) ?? {};
193
- const extraRt = asRecord(nestedExtra?.__rt) ?? {};
194
- if (Object.keys(baseRt).length || Object.keys(extraRt).length) {
195
- nestedMetadata.__rt = { ...baseRt, ...extraRt };
236
+ const buildNestedMetadata = (extra, resolvedEntry) => {
237
+ const out = {
238
+ ...(metadataBag ?? {}),
239
+ ...extra,
240
+ entryEndpoint: resolvedEntry,
241
+ direction: 'request',
242
+ stage: 'inbound'
243
+ };
244
+ try {
245
+ const baseRt = asRecord(metadataBag?.__rt) ?? {};
246
+ const extraRt = asRecord(extra?.__rt) ?? {};
247
+ if (Object.keys(baseRt).length || Object.keys(extraRt).length) {
248
+ out.__rt = { ...baseRt, ...extraRt };
249
+ }
196
250
  }
197
- }
198
- catch {
199
- // best-effort
200
- }
201
- if (asRecord(nestedMetadata.__rt)?.serverToolFollowup === true) {
202
- const preservedClientHeaders = extractFollowupSessionHeaders(nestedMetadata.clientHeaders);
203
- if (preservedClientHeaders) {
204
- nestedMetadata.clientHeaders = preservedClientHeaders;
205
- if (typeof nestedMetadata.sessionId !== 'string' || !nestedMetadata.sessionId.trim()) {
206
- const sessionId = extractPreservedSessionToken(preservedClientHeaders, 'session');
207
- if (sessionId) {
208
- nestedMetadata.sessionId = sessionId;
251
+ catch {
252
+ // best-effort
253
+ }
254
+ if (asRecord(out.__rt)?.serverToolFollowup === true) {
255
+ const preservedClientHeaders = extractFollowupSessionHeaders(out.clientHeaders);
256
+ if (preservedClientHeaders) {
257
+ out.clientHeaders = preservedClientHeaders;
258
+ if (typeof out.sessionId !== 'string' || !out.sessionId.trim()) {
259
+ const sessionId = extractPreservedSessionToken(preservedClientHeaders, 'session');
260
+ if (sessionId) {
261
+ out.sessionId = sessionId;
262
+ }
209
263
  }
210
- }
211
- if (typeof nestedMetadata.conversationId !== 'string' || !nestedMetadata.conversationId.trim()) {
212
- const conversationId = extractPreservedSessionToken(preservedClientHeaders, 'conversation');
213
- if (conversationId) {
214
- nestedMetadata.conversationId = conversationId;
264
+ if (typeof out.conversationId !== 'string' || !out.conversationId.trim()) {
265
+ const conversationId = extractPreservedSessionToken(preservedClientHeaders, 'conversation');
266
+ if (conversationId) {
267
+ out.conversationId = conversationId;
268
+ }
269
+ }
270
+ if (typeof out.clockDaemonId !== 'string' || !out.clockDaemonId.trim()) {
271
+ const daemonId = (typeof out.clientDaemonId === 'string' && out.clientDaemonId.trim())
272
+ ? out.clientDaemonId
273
+ : extractPreservedDaemonOrInjectToken(preservedClientHeaders, 'daemon');
274
+ if (daemonId) {
275
+ out.clientDaemonId = daemonId;
276
+ out.clockDaemonId = daemonId;
277
+ }
278
+ }
279
+ else if (typeof out.clientDaemonId !== 'string' || !out.clientDaemonId.trim()) {
280
+ out.clientDaemonId = out.clockDaemonId;
281
+ }
282
+ if (typeof out.clientTmuxSessionId !== 'string' || !out.clientTmuxSessionId.trim()) {
283
+ const tmuxSessionId = extractPreservedDaemonOrInjectToken(preservedClientHeaders, 'tmux');
284
+ if (tmuxSessionId) {
285
+ out.clientTmuxSessionId = tmuxSessionId;
286
+ out.tmuxSessionId = tmuxSessionId;
287
+ }
288
+ }
289
+ else if (typeof out.tmuxSessionId !== 'string' || !out.tmuxSessionId.trim()) {
290
+ out.tmuxSessionId = out.clientTmuxSessionId;
291
+ }
292
+ if (typeof out.clientWorkdir !== 'string' || !out.clientWorkdir.trim()) {
293
+ const workdir = (typeof out.workdir === 'string' && out.workdir.trim())
294
+ ? out.workdir
295
+ : extractPreservedDaemonOrInjectToken(preservedClientHeaders, 'workdir');
296
+ if (workdir) {
297
+ out.clientWorkdir = workdir;
298
+ out.workdir = workdir;
299
+ }
300
+ }
301
+ else if (typeof out.workdir !== 'string' || !out.workdir.trim()) {
302
+ out.workdir = out.clientWorkdir;
215
303
  }
216
304
  }
305
+ else {
306
+ delete out.clientHeaders;
307
+ }
308
+ delete out.clientRequestId;
217
309
  }
218
- else {
219
- delete nestedMetadata.clientHeaders;
220
- }
221
- delete nestedMetadata.clientRequestId;
222
- }
223
- bindClockConversationSession(nestedMetadata);
310
+ return out;
311
+ };
312
+ const nestedMetadata = buildNestedMetadata(nestedExtra, nestedEntry);
224
313
  const nestedInput = {
225
314
  entryEndpoint: nestedEntry,
226
315
  method: 'POST',
@@ -230,33 +319,104 @@ export async function convertProviderResponseIfNeeded(options, deps) {
230
319
  body: reenterOpts.body,
231
320
  metadata: nestedMetadata
232
321
  };
233
- try {
234
- const requestBody = reenterOpts.body;
235
- const messages = Array.isArray(requestBody.messages) ? requestBody.messages : [];
236
- const lastUser = [...messages]
237
- .reverse()
238
- .find((entry) => entry && typeof entry === 'object' && entry.role === 'user');
239
- const text = typeof lastUser?.content === 'string' ? String(lastUser.content) : '';
240
- if (text.includes('<**clock:{') && text.includes('}**>')) {
241
- await injectClockClientPrompt({
242
- tmuxSessionId: typeof nestedMetadata.tmuxSessionId === 'string' ? nestedMetadata.tmuxSessionId : undefined,
243
- sessionId: typeof nestedMetadata.sessionId === 'string' ? nestedMetadata.sessionId : undefined,
244
- workdir: typeof nestedMetadata.workdir === 'string' ? nestedMetadata.workdir : undefined,
245
- text,
246
- requestId: reenterOpts.requestId,
247
- source: 'servertool.reenter'
248
- });
249
- }
250
- }
251
- catch {
252
- // best-effort only
253
- }
254
322
  const nestedResult = await deps.executeNested(nestedInput);
255
323
  const nestedBody = nestedResult.body && typeof nestedResult.body === 'object'
256
324
  ? nestedResult.body
257
325
  : undefined;
258
326
  return { body: nestedBody };
259
327
  };
328
+ const clientInjectDispatch = async (injectOpts) => {
329
+ const nestedEntry = injectOpts.entryEndpoint || options.entryEndpoint || entry;
330
+ const nestedExtra = asRecord(injectOpts.metadata) ?? {};
331
+ const nestedMetadata = (() => {
332
+ const out = {
333
+ ...(metadataBag ?? {}),
334
+ ...nestedExtra,
335
+ entryEndpoint: nestedEntry,
336
+ direction: 'request',
337
+ stage: 'inbound'
338
+ };
339
+ try {
340
+ const baseRt = asRecord(metadataBag?.__rt) ?? {};
341
+ const extraRt = asRecord(nestedExtra?.__rt) ?? {};
342
+ if (Object.keys(baseRt).length || Object.keys(extraRt).length) {
343
+ out.__rt = { ...baseRt, ...extraRt };
344
+ }
345
+ }
346
+ catch {
347
+ // best-effort
348
+ }
349
+ if (asRecord(out.__rt)?.serverToolFollowup === true) {
350
+ const preservedClientHeaders = extractFollowupSessionHeaders(out.clientHeaders);
351
+ if (preservedClientHeaders) {
352
+ out.clientHeaders = preservedClientHeaders;
353
+ if (typeof out.sessionId !== 'string' || !out.sessionId.trim()) {
354
+ const sessionId = extractPreservedSessionToken(preservedClientHeaders, 'session');
355
+ if (sessionId) {
356
+ out.sessionId = sessionId;
357
+ }
358
+ }
359
+ if (typeof out.conversationId !== 'string' || !out.conversationId.trim()) {
360
+ const conversationId = extractPreservedSessionToken(preservedClientHeaders, 'conversation');
361
+ if (conversationId) {
362
+ out.conversationId = conversationId;
363
+ }
364
+ }
365
+ if (typeof out.clockDaemonId !== 'string' || !out.clockDaemonId.trim()) {
366
+ const daemonId = (typeof out.clientDaemonId === 'string' && out.clientDaemonId.trim())
367
+ ? out.clientDaemonId
368
+ : extractPreservedDaemonOrInjectToken(preservedClientHeaders, 'daemon');
369
+ if (daemonId) {
370
+ out.clientDaemonId = daemonId;
371
+ out.clockDaemonId = daemonId;
372
+ }
373
+ }
374
+ else if (typeof out.clientDaemonId !== 'string' || !out.clientDaemonId.trim()) {
375
+ out.clientDaemonId = out.clockDaemonId;
376
+ }
377
+ if (typeof out.clientTmuxSessionId !== 'string' || !out.clientTmuxSessionId.trim()) {
378
+ const tmuxSessionId = extractPreservedDaemonOrInjectToken(preservedClientHeaders, 'tmux');
379
+ if (tmuxSessionId) {
380
+ out.clientTmuxSessionId = tmuxSessionId;
381
+ out.tmuxSessionId = tmuxSessionId;
382
+ }
383
+ }
384
+ else if (typeof out.tmuxSessionId !== 'string' || !out.tmuxSessionId.trim()) {
385
+ out.tmuxSessionId = out.clientTmuxSessionId;
386
+ }
387
+ if (typeof out.clientWorkdir !== 'string' || !out.clientWorkdir.trim()) {
388
+ const workdir = (typeof out.workdir === 'string' && out.workdir.trim())
389
+ ? out.workdir
390
+ : extractPreservedDaemonOrInjectToken(preservedClientHeaders, 'workdir');
391
+ if (workdir) {
392
+ out.clientWorkdir = workdir;
393
+ out.workdir = workdir;
394
+ }
395
+ }
396
+ else if (typeof out.workdir !== 'string' || !out.workdir.trim()) {
397
+ out.workdir = out.clientWorkdir;
398
+ }
399
+ }
400
+ else {
401
+ delete out.clientHeaders;
402
+ }
403
+ delete out.clientRequestId;
404
+ }
405
+ return out;
406
+ })();
407
+ const requestBody = injectOpts.body && typeof injectOpts.body === 'object' && !Array.isArray(injectOpts.body)
408
+ ? injectOpts.body
409
+ : {};
410
+ const injectResult = await runClientInjectionFlowBeforeReenter({
411
+ nestedMetadata,
412
+ requestBody,
413
+ requestId: injectOpts.requestId
414
+ });
415
+ if (injectResult.clientInjectOnlyHandled) {
416
+ return { ok: true };
417
+ }
418
+ return { ok: false, reason: 'client_inject_not_handled' };
419
+ };
260
420
  const converted = await bridgeConvertProviderResponse({
261
421
  providerProtocol: options.providerProtocol,
262
422
  providerResponse: body,
@@ -266,7 +426,8 @@ export async function convertProviderResponseIfNeeded(options, deps) {
266
426
  requestSemantics: options.requestSemantics,
267
427
  providerInvoker: serverToolsEnabled ? providerInvoker : undefined,
268
428
  stageRecorder,
269
- reenterPipeline: serverToolsEnabled ? reenterPipeline : undefined
429
+ reenterPipeline: serverToolsEnabled ? reenterPipeline : undefined,
430
+ clientInjectDispatch: serverToolsEnabled ? clientInjectDispatch : undefined
270
431
  });
271
432
  if (converted.__sse_responses) {
272
433
  return {
@@ -323,6 +484,19 @@ export async function convertProviderResponseIfNeeded(options, deps) {
323
484
  errRecord.code = 'HTTP_429';
324
485
  }
325
486
  }
487
+ if (isServerToolFollowupError) {
488
+ console.error('[RequestExecutor] ServerTool followup failed', {
489
+ requestId: options.requestId,
490
+ code: errCode,
491
+ upstreamCode: upstreamCode || detailUpstreamCode,
492
+ reason: detailReason,
493
+ message
494
+ });
495
+ if (normalizedUpstreamCode === 'client_inject_failed') {
496
+ // Followup rejection should not break the main assistant response.
497
+ return options.response;
498
+ }
499
+ }
326
500
  if (isVerboseErrorLoggingEnabled()) {
327
501
  console.error('[RequestExecutor] Fatal conversion error, bubbling as HTTP error', error);
328
502
  }
@@ -1 +1 @@
1
- {"version":3,"file":"provider-response-converter.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/provider-response-converter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"provider-response-converter.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/provider-response-converter.ts"],"names":[],"mappings":"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"}
@@ -77,6 +77,11 @@ export function buildProviderLabel(providerKey, model) {
77
77
  return undefined;
78
78
  }
79
79
  if (key && modelId) {
80
+ const normalizedKey = key.toLowerCase();
81
+ const normalizedModel = modelId.toLowerCase();
82
+ if (normalizedKey === normalizedModel || normalizedKey.endsWith(`.${normalizedModel}`)) {
83
+ return key;
84
+ }
80
85
  return `${key}.${modelId}`;
81
86
  }
82
87
  return key || modelId;
@@ -1 +1 @@
1
- {"version":3,"file":"provider-response-utils.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/provider-response-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"provider-response-utils.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/provider-response-utils.ts"],"names":[],"mappings":"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"}
@@ -5,3 +5,5 @@ export declare function writeInboundClientSnapshot(options: {
5
5
  clientRequestId: string;
6
6
  }): Promise<void>;
7
7
  export declare function isPoolExhaustedPipelineError(pipelineError: unknown): boolean;
8
+ export declare function resolvePoolCooldownWaitMs(pipelineError: unknown): number | undefined;
9
+ export declare function mergeMetadataPreservingDefined(base: Record<string, unknown>, overlay?: Record<string, unknown> | null): Record<string, unknown>;
@@ -36,4 +36,64 @@ export function isPoolExhaustedPipelineError(pipelineError) {
36
36
  /all providers unavailable/i.test(pipelineErrorMessage) ||
37
37
  /virtual router did not produce a provider target/i.test(pipelineErrorMessage));
38
38
  }
39
+ const POOL_COOLDOWN_WAIT_MAX_MS = 3 * 60 * 1000;
40
+ function coercePositiveMs(value) {
41
+ if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
42
+ return Math.floor(value);
43
+ }
44
+ if (typeof value === 'string' && value.trim()) {
45
+ const parsed = Number.parseInt(value.trim(), 10);
46
+ if (Number.isFinite(parsed) && parsed > 0) {
47
+ return Math.floor(parsed);
48
+ }
49
+ }
50
+ return undefined;
51
+ }
52
+ export function resolvePoolCooldownWaitMs(pipelineError) {
53
+ if (!pipelineError || typeof pipelineError !== 'object') {
54
+ return undefined;
55
+ }
56
+ const details = pipelineError.details;
57
+ if (!details || typeof details !== 'object' || Array.isArray(details)) {
58
+ return undefined;
59
+ }
60
+ const record = details;
61
+ const direct = coercePositiveMs(record.minRecoverableCooldownMs);
62
+ const hints = Array.isArray(record.recoverableCooldownHints) ? record.recoverableCooldownHints : [];
63
+ const hinted = hints.reduce((best, item) => {
64
+ if (!item || typeof item !== 'object' || Array.isArray(item)) {
65
+ return best;
66
+ }
67
+ const waitMs = coercePositiveMs(item.waitMs);
68
+ if (!waitMs) {
69
+ return best;
70
+ }
71
+ if (!best || waitMs < best) {
72
+ return waitMs;
73
+ }
74
+ return best;
75
+ }, undefined);
76
+ const candidate = (() => {
77
+ if (direct && hinted) {
78
+ return Math.min(direct, hinted);
79
+ }
80
+ return direct ?? hinted;
81
+ })();
82
+ if (!candidate || candidate > POOL_COOLDOWN_WAIT_MAX_MS) {
83
+ return undefined;
84
+ }
85
+ return Math.max(50, candidate);
86
+ }
87
+ export function mergeMetadataPreservingDefined(base, overlay) {
88
+ const merged = { ...base };
89
+ if (!overlay || typeof overlay !== 'object') {
90
+ return merged;
91
+ }
92
+ for (const [key, value] of Object.entries(overlay)) {
93
+ if (value !== undefined) {
94
+ merged[key] = value;
95
+ }
96
+ }
97
+ return merged;
98
+ }
39
99
  //# sourceMappingURL=request-executor-core-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"request-executor-core-utils.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/request-executor-core-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,OAIhD;IACC,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAC5D,IAAI,CAAC;QACH,MAAM,QAAQ,GACZ,CAAC,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAClF,CAAC,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QACrF,MAAM,gBAAgB,GACpB,CAAC,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAClF,CAAC,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QACrF,MAAM,mBAAmB,CAAC;YACxB,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;YAChC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE;gBACR,GAAG,eAAe;gBAClB,eAAe;gBACf,SAAS,EAAE,QAAQ;gBACnB,gBAAgB,EAAE,gBAAgB;aACnC;SACF,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,iDAAiD;IACnD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,aAAsB;IACjE,MAAM,iBAAiB,GACrB,OAAQ,aAAoC,CAAC,IAAI,KAAK,QAAQ;QAC5D,CAAC,CAAC,MAAM,CAAE,aAAmC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE;QAC1D,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,oBAAoB,GACxB,aAAa,YAAY,KAAK;QAC5B,CAAC,CAAC,aAAa,CAAC,OAAO;QACvB,CAAC,CAAC,MAAM,CAAC,aAAa,IAAI,eAAe,CAAC,CAAC;IAC/C,OAAO,CACL,iBAAiB,KAAK,wBAAwB;QAC9C,iBAAiB,KAAK,wBAAwB;QAC9C,4BAA4B,CAAC,IAAI,CAAC,oBAAoB,CAAC;QACvD,mDAAmD,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAC/E,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"request-executor-core-utils.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/request-executor-core-utils.ts"],"names":[],"mappings":"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"}
@@ -176,6 +176,16 @@ function normalizeSessionToken(value) {
176
176
  const trimmed = value.trim();
177
177
  return trimmed || undefined;
178
178
  }
179
+ function resolveClockConversationSessionId(metadata) {
180
+ const tmuxSessionId = normalizeSessionToken(metadata.clientTmuxSessionId)
181
+ ?? normalizeSessionToken(metadata.client_tmux_session_id)
182
+ ?? normalizeSessionToken(metadata.tmuxSessionId)
183
+ ?? normalizeSessionToken(metadata.tmux_session_id);
184
+ if (tmuxSessionId) {
185
+ return `tmux:${tmuxSessionId}`;
186
+ }
187
+ return undefined;
188
+ }
179
189
  function inferClockClientTypeFromMetadata(metadata) {
180
190
  const direct = normalizeSessionToken(metadata.clockClientType) ?? normalizeSessionToken(metadata.clientType);
181
191
  if (direct) {
@@ -191,25 +201,27 @@ function inferClockClientTypeFromMetadata(metadata) {
191
201
  return undefined;
192
202
  }
193
203
  export function bindClockConversationSession(metadata) {
194
- const conversationSessionId = normalizeSessionToken(metadata.sessionId);
204
+ const conversationSessionId = resolveClockConversationSessionId(metadata);
195
205
  if (!conversationSessionId) {
196
206
  return;
197
207
  }
198
- const tmuxSessionId = normalizeSessionToken(metadata.tmuxSessionId);
199
- const daemonId = normalizeSessionToken(metadata.clockDaemonId)
200
- ?? normalizeSessionToken(metadata.clockClientDaemonId);
208
+ const tmuxSessionId = normalizeSessionToken(metadata.clientTmuxSessionId)
209
+ ?? normalizeSessionToken(metadata.client_tmux_session_id)
210
+ ?? normalizeSessionToken(metadata.tmuxSessionId);
201
211
  const clientType = inferClockClientTypeFromMetadata(metadata);
202
- const workdir = normalizeSessionToken(metadata.workdir)
212
+ const workdir = normalizeSessionToken(metadata.clientWorkdir)
213
+ ?? normalizeSessionToken(metadata.client_workdir)
214
+ ?? normalizeSessionToken(metadata.workdir)
203
215
  ?? normalizeSessionToken(metadata.cwd)
204
216
  ?? normalizeSessionToken(metadata.workingDirectory);
205
217
  try {
206
- getClockClientRegistry().bindConversationSession({
218
+ const bindInput = {
207
219
  conversationSessionId,
208
220
  ...(tmuxSessionId ? { tmuxSessionId } : {}),
209
- ...(daemonId ? { daemonId } : {}),
210
221
  ...(clientType ? { clientType } : {}),
211
222
  ...(workdir ? { workdir } : {})
212
- });
223
+ };
224
+ getClockClientRegistry().bindConversationSession(bindInput);
213
225
  }
214
226
  catch {
215
227
  // best-effort only