@jsonstudio/rcc 0.90.876 → 0.90.1270

package/dist/server/runtime/http-server/executor/servertool-adapter-context.js

@@ -0,0 +1,120 @@
+import { applyClientConnectionStateToContext } from '../../../utils/client-connection-state.js';
+import { resolveStopMessageClientInjectReadiness } from './client-injection-flow.js';
+import { extractClientModelId } from './provider-response-utils.js';
+import { backfillAdapterContextSessionIdentifiersFromOriginalRequest, seedReasoningStopStateFromCapturedRequest } from './servertool-request-normalizer.js';
+function asFlatRecord(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return undefined;
+    }
+    return value;
+}
+function readNonEmptyString(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    return trimmed || undefined;
+}
+function hasStoplessDirectiveInRequestPayload(payload) {
+    if (!payload || typeof payload !== 'object') {
+        return false;
+    }
+    try {
+        return JSON.stringify(payload).toLowerCase().includes('<**stopless:');
+    }
+    catch {
+        return false;
+    }
+}
+function backfillCapturedChatRequestToolsFromRequestSemantics(baseContext, requestSemantics) {
+    const capturedChatRequest = asFlatRecord(baseContext.capturedChatRequest);
+    const semanticsRecord = asFlatRecord(requestSemantics);
+    const toolsRecord = asFlatRecord(semanticsRecord?.tools);
+    const clientToolsRaw = Array.isArray(toolsRecord?.clientToolsRaw) ? toolsRecord.clientToolsRaw : undefined;
+    if (!capturedChatRequest || !clientToolsRaw?.length) {
+        return;
+    }
+    const existingTools = Array.isArray(capturedChatRequest.tools) ? capturedChatRequest.tools : undefined;
+    if (existingTools?.length) {
+        return;
+    }
+    capturedChatRequest.tools = clientToolsRaw;
+}
+function preferOriginalRequestForReasoningStopSync(baseContext, originalRequest) {
+    if (!asFlatRecord(originalRequest)) {
+        return;
+    }
+    if (!hasStoplessDirectiveInRequestPayload(originalRequest)) {
+        return;
+    }
+    if (hasStoplessDirectiveInRequestPayload(baseContext.capturedChatRequest)) {
+        return;
+    }
+    baseContext.capturedChatRequest = originalRequest;
+}
+function resolveAssignedModelId(metadataBag) {
+    return readNonEmptyString(metadataBag?.assignedModelId)
+        ?? readNonEmptyString(asFlatRecord(metadataBag?.target)?.modelId)
+        ?? readNonEmptyString(metadataBag?.modelId);
+}
+function resolveCompatProfile(metadataBag) {
+    return readNonEmptyString(asFlatRecord(metadataBag?.target)?.compatibilityProfile)
+        ?? readNonEmptyString(metadataBag?.compatibilityProfile);
+}
+export function buildServerToolAdapterContext(args) {
+    const metadataBag = asFlatRecord(args.metadata) ?? {};
+    const baseContext = {
+        ...metadataBag
+    };
+    if (!asFlatRecord(baseContext.capturedChatRequest) && asFlatRecord(args.originalRequest)) {
+        baseContext.capturedChatRequest = args.originalRequest;
+    }
+    preferOriginalRequestForReasoningStopSync(baseContext, args.originalRequest);
+    backfillAdapterContextSessionIdentifiersFromOriginalRequest(baseContext, args.originalRequest);
+    backfillCapturedChatRequestToolsFromRequestSemantics(baseContext, args.requestSemantics);
+    seedReasoningStopStateFromCapturedRequest(baseContext, args.onReasoningStopSeedError);
+    const routeName = readNonEmptyString(metadataBag.routeName);
+    if (routeName) {
+        baseContext.routeId = routeName;
+    }
+    baseContext.requestId = args.requestId;
+    baseContext.entryEndpoint = args.entryEndpoint;
+    baseContext.providerProtocol = args.providerProtocol;
+    const originalModelId = extractClientModelId(metadataBag, args.originalRequest);
+    if (originalModelId) {
+        baseContext.originalModelId = originalModelId;
+    }
+    const assignedModelId = resolveAssignedModelId(metadataBag);
+    if (assignedModelId) {
+        baseContext.modelId = assignedModelId;
+    }
+    applyClientConnectionStateToContext(metadataBag, baseContext);
+    const stopMessageInjectReadiness = resolveStopMessageClientInjectReadiness(baseContext);
+    const rt = asFlatRecord(baseContext.__rt) ?? {};
+    baseContext.__rt = {
+        ...rt,
+        stopMessageClientInjectReady: stopMessageInjectReadiness.ready,
+        stopMessageClientInjectReason: stopMessageInjectReadiness.reason,
+        ...(stopMessageInjectReadiness.sessionScope
+            ? { stopMessageClientInjectSessionScope: stopMessageInjectReadiness.sessionScope }
+            : {}),
+        ...(stopMessageInjectReadiness.tmuxSessionId
+            ? { stopMessageClientInjectTmuxSessionId: stopMessageInjectReadiness.tmuxSessionId }
+            : {})
+    };
+    const compatProfile = resolveCompatProfile(metadataBag);
+    if (compatProfile) {
+        baseContext.compatibilityProfile = compatProfile;
+    }
+    if (typeof args.serverToolsEnabled === 'boolean') {
+        baseContext.serverToolsEnabled = args.serverToolsEnabled;
+        if (!args.serverToolsEnabled) {
+            baseContext.serverToolsDisabled = true;
+        }
+        else if (Object.prototype.hasOwnProperty.call(baseContext, 'serverToolsDisabled')) {
+            delete baseContext.serverToolsDisabled;
+        }
+    }
+    return baseContext;
+}
+//# sourceMappingURL=servertool-adapter-context.js.map

package/dist/server/runtime/http-server/executor/servertool-adapter-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"servertool-adapter-context.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/servertool-adapter-context.ts"],"names":[],"mappings":"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"}

package/dist/server/runtime/http-server/executor/servertool-followup-dispatch.d.ts

@@ -0,0 +1,35 @@
+import type { PipelineExecutionInput, PipelineExecutionResult } from '../../../handlers/types.js';
+type ServerToolNestedExecute = (input: PipelineExecutionInput) => Promise<PipelineExecutionResult>;
+type BuildNestedMetadataLogger = (error: unknown, details: {
+    requestId: string;
+    entryEndpoint: string;
+    mode: 'reenter' | 'client_inject';
+}) => void;
+export declare function executeServerToolReenterPipeline(args: {
+    entryEndpoint: string;
+    fallbackEntryEndpoint: string;
+    requestId: string;
+    body?: Record<string, unknown>;
+    metadata?: Record<string, unknown>;
+    baseMetadata?: Record<string, unknown>;
+    executeNested: ServerToolNestedExecute;
+    onMergeRuntimeMetaError?: BuildNestedMetadataLogger;
+    runClientInjectBeforeNested?: boolean;
+}): Promise<{
+    body?: Record<string, unknown>;
+    __sse_responses?: unknown;
+    format?: string;
+}>;
+export declare function executeServerToolClientInjectDispatch(args: {
+    entryEndpoint: string;
+    fallbackEntryEndpoint: string;
+    requestId: string;
+    body?: Record<string, unknown>;
+    metadata?: Record<string, unknown>;
+    baseMetadata?: Record<string, unknown>;
+    onMergeRuntimeMetaError?: BuildNestedMetadataLogger;
+}): Promise<{
+    ok: boolean;
+    reason?: string;
+}>;
+export {};

package/dist/server/runtime/http-server/executor/servertool-followup-dispatch.js

@@ -0,0 +1,101 @@
+import { asRecord } from '../provider-utils.js';
+import { runClientInjectionFlowBeforeReenter } from './client-injection-flow.js';
+import { buildServerToolNestedRequestMetadata } from './servertool-followup-metadata.js';
+function cloneStringHeaders(headers) {
+    if (!headers || typeof headers !== 'object' || Array.isArray(headers)) {
+        return undefined;
+    }
+    const cloned = {};
+    for (const [headerName, headerValue] of Object.entries(headers)) {
+        if (typeof headerValue !== 'string' || !headerValue.trim()) {
+            continue;
+        }
+        cloned[headerName] = headerValue;
+    }
+    return Object.keys(cloned).length ? cloned : undefined;
+}
+function asObjectBody(value) {
+    return value && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : {};
+}
+function buildServerToolNestedInput(args) {
+    const nestedEntry = args.entryEndpoint || args.fallbackEntryEndpoint;
+    const nestedExtra = asRecord(args.metadata) ?? {};
+    const nestedMetadata = buildServerToolNestedRequestMetadata({
+        baseMetadata: args.baseMetadata,
+        extraMetadata: nestedExtra,
+        entryEndpoint: nestedEntry,
+        onMergeRuntimeMetaError: args.onMergeRuntimeMetaError
+            ? (error) => {
+                args.onMergeRuntimeMetaError?.(error, {
+                    requestId: args.requestId,
+                    entryEndpoint: nestedEntry,
+                    mode: args.mode
+                });
+            }
+            : undefined
+    });
+    return {
+        nestedEntry,
+        nestedMetadata,
+        nestedInput: {
+            entryEndpoint: nestedEntry,
+            method: 'POST',
+            requestId: args.requestId,
+            headers: cloneStringHeaders(nestedMetadata.clientHeaders) ?? {},
+            query: {},
+            body: args.body ?? {},
+            metadata: nestedMetadata
+        }
+    };
+}
+export async function executeServerToolReenterPipeline(args) {
+    const { nestedMetadata, nestedInput } = buildServerToolNestedInput({
+        entryEndpoint: args.entryEndpoint,
+        fallbackEntryEndpoint: args.fallbackEntryEndpoint,
+        requestId: args.requestId,
+        body: args.body,
+        metadata: args.metadata,
+        baseMetadata: args.baseMetadata,
+        mode: 'reenter',
+        onMergeRuntimeMetaError: args.onMergeRuntimeMetaError
+    });
+    if (args.runClientInjectBeforeNested !== false) {
+        const injectResult = await runClientInjectionFlowBeforeReenter({
+            nestedMetadata,
+            requestBody: asObjectBody(args.body),
+            requestId: args.requestId
+        });
+        if (injectResult.clientInjectOnlyHandled) {
+            return { body: { ok: true, mode: 'client_inject_only' } };
+        }
+    }
+    const nestedResult = await args.executeNested(nestedInput);
+    const nestedBody = nestedResult.body && typeof nestedResult.body === 'object'
+        ? nestedResult.body
+        : undefined;
+    return { body: nestedBody };
+}
+export async function executeServerToolClientInjectDispatch(args) {
+    const { nestedMetadata } = buildServerToolNestedInput({
+        entryEndpoint: args.entryEndpoint,
+        fallbackEntryEndpoint: args.fallbackEntryEndpoint,
+        requestId: args.requestId,
+        body: args.body,
+        metadata: args.metadata,
+        baseMetadata: args.baseMetadata,
+        mode: 'client_inject',
+        onMergeRuntimeMetaError: args.onMergeRuntimeMetaError
+    });
+    const injectResult = await runClientInjectionFlowBeforeReenter({
+        nestedMetadata,
+        requestBody: asObjectBody(args.body),
+        requestId: args.requestId
+    });
+    if (injectResult.clientInjectOnlyHandled) {
+        return { ok: true };
+    }
+    return { ok: false, reason: 'client_inject_not_handled' };
+}
+//# sourceMappingURL=servertool-followup-dispatch.js.map

package/dist/server/runtime/http-server/executor/servertool-followup-dispatch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"servertool-followup-dispatch.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/servertool-followup-dispatch.ts"],"names":[],"mappings":"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"}

package/dist/server/runtime/http-server/executor/servertool-followup-error.d.ts

@@ -0,0 +1,46 @@
+export declare function compactFollowupLogReason(value: unknown): string | undefined;
+export declare function isServerToolFollowupError(error: unknown): boolean;
+export declare function extractServerToolFollowupErrorLogDetails(error: unknown): {
+    code?: string;
+    upstreamCode?: string;
+    reason?: string;
+};
+export declare function finalizeServerToolFollowupConvertError(args: {
+    error: unknown;
+    requestId: string;
+    defaultStatus?: number;
+    message?: string;
+}): {
+    matched: boolean;
+    stageDetails?: {
+        code?: string;
+        upstreamCode?: string;
+        reason?: string;
+        message?: string;
+    };
+};
+export declare function finalizeServerToolBridgeConvertError(args: {
+    error: unknown;
+    requestId: string;
+    message: string;
+    defaultFollowupStatus?: number;
+    isSseDecodeError?: boolean;
+    isContextLengthExceeded?: boolean;
+    code?: string;
+    upstreamCode?: string;
+    detailUpstreamCode?: string;
+    detailReason?: string;
+}): {
+    handled: boolean;
+    stageDetails?: {
+        code?: string;
+        upstreamCode?: string;
+        reason?: string;
+        message?: string;
+    };
+};
+export declare function markServerToolFollowupError(args: {
+    error: unknown;
+    requestId: string;
+    defaultStatus?: number;
+}): boolean;

package/dist/server/runtime/http-server/executor/servertool-followup-error.js

@@ -0,0 +1,127 @@
+import { asRecord } from '../provider-utils.js';
+const FOLLOWUP_LOG_REASON_MAX_LEN = 180;
+export function compactFollowupLogReason(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const normalized = value.trim().replace(/\s+/g, ' ');
+    if (!normalized) {
+        return undefined;
+    }
+    const httpMatch = normalized.match(/^http\s+(\d{3})\s*:/i) ||
+        normalized.match(/\bhttp\s+(\d{3})\b/i);
+    if (httpMatch?.[1]) {
+        return `HTTP_${httpMatch[1]}`;
+    }
+    if (/<\s*!doctype\s+html\b/i.test(normalized) || /<\s*html\b/i.test(normalized)) {
+        return 'UPSTREAM_HTML_ERROR';
+    }
+    if (normalized.length <= FOLLOWUP_LOG_REASON_MAX_LEN) {
+        return normalized;
+    }
+    return `${normalized.slice(0, FOLLOWUP_LOG_REASON_MAX_LEN)}…`;
+}
+export function isServerToolFollowupError(error) {
+    const record = error && typeof error === 'object' ? error : undefined;
+    const code = typeof record?.code === 'string' ? record.code : undefined;
+    return Boolean(code === 'SERVERTOOL_FOLLOWUP_FAILED' ||
+        code === 'SERVERTOOL_EMPTY_FOLLOWUP' ||
+        (typeof code === 'string' && code.startsWith('SERVERTOOL_')));
+}
+export function extractServerToolFollowupErrorLogDetails(error) {
+    if (!error || typeof error !== 'object') {
+        return {};
+    }
+    const errRecord = error;
+    const errCode = typeof errRecord.code === 'string' ? errRecord.code : undefined;
+    const upstreamCode = typeof errRecord.upstreamCode === 'string' ? errRecord.upstreamCode : undefined;
+    const detailRecord = asRecord(errRecord.details);
+    const detailReason = typeof detailRecord?.reason === 'string'
+        ? detailRecord.reason
+        : typeof detailRecord?.error === 'string'
+            ? detailRecord.error
+            : undefined;
+    const detailUpstreamCode = typeof detailRecord?.upstreamCode === 'string'
+        ? detailRecord.upstreamCode
+        : undefined;
+    return {
+        ...(compactFollowupLogReason(errCode) || errCode ? { code: compactFollowupLogReason(errCode) || errCode } : {}),
+        ...(compactFollowupLogReason(upstreamCode || detailUpstreamCode)
+            ? { upstreamCode: compactFollowupLogReason(upstreamCode || detailUpstreamCode) }
+            : {}),
+        ...(compactFollowupLogReason(detailReason) || compactFollowupLogReason(error?.message)
+            ? { reason: compactFollowupLogReason(detailReason) || compactFollowupLogReason(error?.message) }
+            : {})
+    };
+}
+export function finalizeServerToolFollowupConvertError(args) {
+    const matched = markServerToolFollowupError({
+        error: args.error,
+        requestId: args.requestId,
+        defaultStatus: args.defaultStatus
+    });
+    if (!matched) {
+        return { matched: false };
+    }
+    const logDetails = extractServerToolFollowupErrorLogDetails(args.error);
+    return {
+        matched: true,
+        stageDetails: {
+            ...(logDetails.code ? { code: logDetails.code } : {}),
+            ...(logDetails.upstreamCode ? { upstreamCode: logDetails.upstreamCode } : {}),
+            ...(logDetails.reason ? { reason: logDetails.reason } : {}),
+            ...(args.message ? { message: args.message } : {})
+        }
+    };
+}
+export function finalizeServerToolBridgeConvertError(args) {
+    const followupPlan = finalizeServerToolFollowupConvertError({
+        error: args.error,
+        requestId: args.requestId,
+        defaultStatus: args.defaultFollowupStatus,
+        message: args.message
+    });
+    if (followupPlan.matched) {
+        return {
+            handled: true,
+            stageDetails: followupPlan.stageDetails
+        };
+    }
+    if (!args.isSseDecodeError && !args.isContextLengthExceeded) {
+        return { handled: false };
+    }
+    if (args.isSseDecodeError && args.error && typeof args.error === 'object') {
+        args.error.requestExecutorProviderErrorStage = 'provider.sse_decode';
+    }
+    const normalizedCode = typeof args.error?.code === 'string'
+        ? String(args.error.code)
+        : args.code;
+    return {
+        handled: true,
+        stageDetails: {
+            ...(normalizedCode ? { code: normalizedCode } : {}),
+            ...((args.upstreamCode || args.detailUpstreamCode)
+                ? { upstreamCode: args.upstreamCode || args.detailUpstreamCode }
+                : {}),
+            ...(compactFollowupLogReason(args.detailReason)
+                ? { reason: compactFollowupLogReason(args.detailReason) }
+                : {}),
+            message: args.message
+        }
+    };
+}
+export function markServerToolFollowupError(args) {
+    if (!isServerToolFollowupError(args.error) || !args.error || typeof args.error !== 'object') {
+        return false;
+    }
+    const errRecord = args.error;
+    errRecord.requestExecutorProviderErrorStage = 'provider.followup';
+    if (typeof args.defaultStatus === 'number' &&
+        typeof errRecord.status !== 'number' &&
+        typeof errRecord.statusCode !== 'number') {
+        errRecord.status = args.defaultStatus;
+        errRecord.statusCode = args.defaultStatus;
+    }
+    return true;
+}
+//# sourceMappingURL=servertool-followup-error.js.map

package/dist/server/runtime/http-server/executor/servertool-followup-error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"servertool-followup-error.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/servertool-followup-error.ts"],"names":[],"mappings":"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"}

package/dist/server/runtime/http-server/executor/servertool-followup-metadata.d.ts

@@ -0,0 +1,7 @@
+export declare function extractFollowupSessionHeaders(headers: unknown): Record<string, string> | undefined;
+export declare function buildServerToolNestedRequestMetadata(args: {
+    baseMetadata?: Record<string, unknown>;
+    extraMetadata?: Record<string, unknown>;
+    entryEndpoint: string;
+    onMergeRuntimeMetaError?: (error: unknown) => void;
+}): Record<string, unknown>;

package/dist/server/runtime/http-server/executor/servertool-followup-metadata.js

@@ -0,0 +1,186 @@
+const FOLLOWUP_SESSION_HEADER_KEYS = new Set([
+    'sessionid',
+    'conversationid',
+    'xsessionid',
+    'xconversationid',
+    'anthropicsessionid',
+    'anthropicconversationid',
+    'xroutecodexsessionid',
+    'xroutecodexconversationid',
+    'xroutecodexclientdaemonid',
+    'xroutecodexclientdid',
+    'xrccclientdaemonid',
+    'xroutecodexsessiondaemonid',
+    'xroutecodexdaemonid',
+    'xrccsessiondaemonid',
+    'xroutecodexclienttmuxsessionid',
+    'xrccclienttmuxsessionid',
+    'xroutecodextmuxsessionid',
+    'xrcctmuxsessionid',
+    'xtmuxsessionid',
+    'xroutecodexclientworkdir',
+    'xrccclientworkdir',
+    'xroutecodexworkdir',
+    'xrccworkdir',
+    'xworkdir'
+]);
+function asRecord(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return undefined;
+    }
+    return value;
+}
+function cloneStringHeaders(headers) {
+    const source = asRecord(headers);
+    if (!source) {
+        return undefined;
+    }
+    const cloned = {};
+    for (const [headerName, headerValue] of Object.entries(source)) {
+        const normalizedValue = readNonEmptyString(headerValue);
+        if (!normalizedValue) {
+            continue;
+        }
+        cloned[headerName] = normalizedValue;
+    }
+    return Object.keys(cloned).length ? cloned : undefined;
+}
+function readNonEmptyString(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    return trimmed || undefined;
+}
+function canonicalizeHeaderName(headerName) {
+    return headerName.toLowerCase().replace(/[^a-z0-9]/g, '');
+}
+export function extractFollowupSessionHeaders(headers) {
+    if (!headers || typeof headers !== 'object' || Array.isArray(headers)) {
+        return undefined;
+    }
+    const source = headers;
+    const preserved = {};
+    for (const [headerName, headerValue] of Object.entries(source)) {
+        if (!FOLLOWUP_SESSION_HEADER_KEYS.has(canonicalizeHeaderName(headerName))) {
+            continue;
+        }
+        const normalizedValue = readNonEmptyString(headerValue);
+        if (!normalizedValue) {
+            continue;
+        }
+        preserved[headerName] = normalizedValue;
+    }
+    return Object.keys(preserved).length ? preserved : undefined;
+}
+function extractPreservedSessionToken(headers, field) {
+    if (!headers) {
+        return undefined;
+    }
+    for (const [headerName, headerValue] of Object.entries(headers)) {
+        const normalizedName = canonicalizeHeaderName(headerName);
+        if (field === 'session' && normalizedName.endsWith('sessionid')) {
+            return headerValue;
+        }
+        if (field === 'conversation' && normalizedName.endsWith('conversationid')) {
+            return headerValue;
+        }
+    }
+    return undefined;
+}
+function extractPreservedInjectToken(headers, field) {
+    if (!headers) {
+        return undefined;
+    }
+    for (const [headerName, headerValue] of Object.entries(headers)) {
+        const normalizedName = canonicalizeHeaderName(headerName);
+        if (field === 'daemon' && (normalizedName.endsWith('sessiondaemonid') || normalizedName.endsWith('daemonid'))) {
+            return headerValue;
+        }
+        if (field === 'tmux' && normalizedName.endsWith('tmuxsessionid')) {
+            return headerValue;
+        }
+        if (field === 'workdir' && normalizedName.endsWith('workdir')) {
+            return headerValue;
+        }
+    }
+    return undefined;
+}
+export function buildServerToolNestedRequestMetadata(args) {
+    const baseMetadata = asRecord(args.baseMetadata) ?? {};
+    const extraMetadata = asRecord(args.extraMetadata) ?? {};
+    const out = {
+        ...baseMetadata,
+        ...extraMetadata,
+        entryEndpoint: args.entryEndpoint,
+        direction: 'request',
+        stage: 'inbound'
+    };
+    const mergedClientHeaders = {
+        ...(cloneStringHeaders(baseMetadata.clientHeaders) ?? {}),
+        ...(cloneStringHeaders(extraMetadata.clientHeaders) ?? {})
+    };
+    if (Object.keys(mergedClientHeaders).length > 0) {
+        out.clientHeaders = mergedClientHeaders;
+    }
+    try {
+        const baseRt = asRecord(baseMetadata.__rt) ?? {};
+        const extraRt = asRecord(extraMetadata.__rt) ?? {};
+        if (Object.keys(baseRt).length || Object.keys(extraRt).length) {
+            out.__rt = { ...baseRt, ...extraRt };
+        }
+    }
+    catch (error) {
+        args.onMergeRuntimeMetaError?.(error);
+    }
+    const runtimeMeta = asRecord(out.__rt);
+    if (runtimeMeta?.serverToolFollowup === true) {
+        const continuityHeaders = extractFollowupSessionHeaders(out.clientHeaders);
+        if (continuityHeaders) {
+            const sessionId = extractPreservedSessionToken(continuityHeaders, 'session');
+            const conversationId = extractPreservedSessionToken(continuityHeaders, 'conversation');
+            const daemonId = extractPreservedInjectToken(continuityHeaders, 'daemon');
+            const tmuxSessionId = extractPreservedInjectToken(continuityHeaders, 'tmux');
+            const workdir = extractPreservedInjectToken(continuityHeaders, 'workdir');
+            if (sessionId && !readNonEmptyString(out.sessionId)) {
+                out.sessionId = sessionId;
+            }
+            if (conversationId && !readNonEmptyString(out.conversationId)) {
+                out.conversationId = conversationId;
+            }
+            if (daemonId) {
+                if (!readNonEmptyString(out.clientDaemonId)) {
+                    out.clientDaemonId = daemonId;
+                }
+                if (!readNonEmptyString(out.sessionDaemonId)) {
+                    out.sessionDaemonId = daemonId;
+                }
+                if (!readNonEmptyString(out.sessionClientDaemonId)) {
+                    out.sessionClientDaemonId = daemonId;
+                }
+            }
+            if (tmuxSessionId) {
+                if (!readNonEmptyString(out.clientTmuxSessionId)) {
+                    out.clientTmuxSessionId = tmuxSessionId;
+                }
+                if (!readNonEmptyString(out.tmuxSessionId)) {
+                    out.tmuxSessionId = tmuxSessionId;
+                }
+            }
+            if (workdir) {
+                if (!readNonEmptyString(out.clientWorkdir)) {
+                    out.clientWorkdir = workdir;
+                }
+                if (!readNonEmptyString(out.workdir)) {
+                    out.workdir = workdir;
+                }
+                if (!readNonEmptyString(out.cwd)) {
+                    out.cwd = workdir;
+                }
+            }
+        }
+        delete out.clientRequestId;
+    }
+    return out;
+}
+//# sourceMappingURL=servertool-followup-metadata.js.map