@jsonstudio/rcc 0.89.2202 → 0.90.1

package/dist/server/runtime/http-server/executor/client-injection-flow.js

@@ -0,0 +1,287 @@
+import { getClockClientRegistry, injectClockClientPromptWithResult } from '../clock-client-registry.js';
+import { bindClockConversationSession } from './request-retry-helpers.js';
+function shouldUnbindConversationSessionOnInjectFailure(reasonRaw) {
+    const reason = typeof reasonRaw === 'string' ? reasonRaw.trim().toLowerCase() : '';
+    return (reason === 'tmux_session_required' ||
+        reason === 'no_matching_tmux_session_daemon' ||
+        reason === 'workdir_mismatch' ||
+        reason === 'inject_failed');
+}
+function createClientInjectFailureError(args) {
+    const error = new Error(`[servertool.inject] client injection failed: ${args.reason}`);
+    error.code = args.code || 'SERVERTOOL_FOLLOWUP_FAILED';
+    error.upstreamCode = args.upstreamCode || 'client_inject_failed';
+    error.details = {
+        reason: args.reason,
+        source: args.source,
+        requestId: args.requestId,
+        sessionId: args.sessionId,
+        tmuxSessionId: args.tmuxSessionId
+    };
+    const status = Number.isFinite(args.status) ? Math.floor(Number(args.status)) : 503;
+    error.status = status;
+    error.statusCode = status;
+    error.retryable = false;
+    return error;
+}
+function normalizeInjectToken(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    return trimmed || undefined;
+}
+function shouldTreatExplicitUnreadyAsHardBlock(reasonRaw) {
+    void reasonRaw;
+    return true;
+}
+function resolveInjectWorkdir(metadata) {
+    return (normalizeInjectToken(metadata.clientWorkdir) ||
+        normalizeInjectToken(metadata.client_workdir) ||
+        normalizeInjectToken(metadata.workdir) ||
+        normalizeInjectToken(metadata.cwd) ||
+        normalizeInjectToken(metadata.workingDirectory));
+}
+function resolveInjectConversationSessionId(metadata) {
+    const tmuxSessionId = normalizeInjectToken(metadata.clientTmuxSessionId) ||
+        normalizeInjectToken(metadata.client_tmux_session_id) ||
+        normalizeInjectToken(metadata.tmuxSessionId);
+    if (tmuxSessionId) {
+        return `tmux:${tmuxSessionId}`;
+    }
+    return undefined;
+}
+function resolveStrictClientInjectTarget(args) {
+    const tmuxSessionId = normalizeInjectToken(args.tmuxSessionId);
+    const rawConversationScopeSessionId = normalizeInjectToken(args.conversationSessionId);
+    const conversationScopeSessionId = rawConversationScopeSessionId && rawConversationScopeSessionId.startsWith('tmux:')
+        ? rawConversationScopeSessionId
+        : undefined;
+    const explicitClientInjectReadyRaw = args.clientInjectReady;
+    const explicitClientInjectReady = explicitClientInjectReadyRaw === true
+        ? true
+        : explicitClientInjectReadyRaw === false
+            ? false
+            : (typeof explicitClientInjectReadyRaw === 'string'
+                ? (explicitClientInjectReadyRaw.trim().toLowerCase() === 'true'
+                    ? true
+                    : (explicitClientInjectReadyRaw.trim().toLowerCase() === 'false' ? false : undefined))
+                : undefined);
+    const explicitClientInjectReason = normalizeInjectToken(args.clientInjectReason);
+    if (explicitClientInjectReady === false && shouldTreatExplicitUnreadyAsHardBlock(explicitClientInjectReason)) {
+        throw createClientInjectFailureError({
+            reason: explicitClientInjectReason || 'client_inject_unready',
+            source: args.source,
+            requestId: args.requestId,
+            code: args.failureCode,
+            upstreamCode: args.failureUpstreamCode,
+            status: args.failureStatus
+        });
+    }
+    const tmuxScopeSessionId = tmuxSessionId ? `tmux:${tmuxSessionId}` : undefined;
+    const targetSessionId = conversationScopeSessionId || tmuxScopeSessionId;
+    if (!tmuxSessionId) {
+        throw createClientInjectFailureError({
+            reason: 'tmux_session_required',
+            source: args.source,
+            requestId: args.requestId,
+            code: args.failureCode,
+            upstreamCode: args.failureUpstreamCode,
+            status: args.failureStatus
+        });
+    }
+    return {
+        tmuxSessionId,
+        ...(targetSessionId ? { sessionScope: targetSessionId } : {})
+    };
+}
+async function injectClientPromptStrict(args) {
+    const result = await injectClockClientPromptWithResult({
+        tmuxSessionId: args.tmuxSessionId,
+        ...(args.tmuxTarget ? { tmuxTarget: args.tmuxTarget } : {}),
+        ...(args.clientType ? { clientType: args.clientType } : {}),
+        tmuxOnly: true,
+        workdir: args.workdir,
+        requestId: args.requestId,
+        text: args.text,
+        source: args.source
+    });
+    if (result.ok) {
+        return;
+    }
+    const reason = typeof result.reason === 'string' ? result.reason : 'inject_failed';
+    const normalizedSessionScope = typeof args.sessionScope === 'string' ? args.sessionScope.trim() : '';
+    if (normalizedSessionScope && shouldUnbindConversationSessionOnInjectFailure(reason)) {
+        try {
+            getClockClientRegistry().unbindSessionScope(normalizedSessionScope);
+        }
+        catch {
+            // best-effort cleanup only
+        }
+    }
+    throw createClientInjectFailureError({
+        reason,
+        source: args.source,
+        requestId: args.requestId,
+        sessionId: args.sessionScope,
+        tmuxSessionId: args.tmuxSessionId,
+        code: args.failureCode,
+        upstreamCode: args.failureUpstreamCode,
+        status: args.failureStatus
+    });
+}
+function buildInjectTargetFromMetadata(args) {
+    const tmuxSessionId = typeof args.metadata.clientTmuxSessionId === 'string'
+        ? args.metadata.clientTmuxSessionId
+        : (typeof args.metadata.client_tmux_session_id === 'string'
+            ? args.metadata.client_tmux_session_id
+            : (typeof args.metadata.tmuxSessionId === 'string' ? args.metadata.tmuxSessionId : undefined));
+    const tmuxTarget = typeof args.metadata.clientTmuxTarget === 'string'
+        ? args.metadata.clientTmuxTarget
+        : (typeof args.metadata.client_tmux_target === 'string'
+            ? args.metadata.client_tmux_target
+            : (typeof args.metadata.tmuxTarget === 'string' ? args.metadata.tmuxTarget : undefined));
+    const clientType = typeof args.metadata.clockClientType === 'string'
+        ? args.metadata.clockClientType
+        : (typeof args.metadata.clientType === 'string' ? args.metadata.clientType : undefined);
+    return {
+        ...(tmuxSessionId ? { tmuxSessionId } : {}),
+        ...(tmuxTarget ? { tmuxTarget } : {}),
+        ...(clientType ? { clientType } : {}),
+        workdir: typeof args.metadata.clientWorkdir === 'string'
+            ? args.metadata.clientWorkdir
+            : (typeof args.metadata.client_workdir === 'string'
+                ? args.metadata.client_workdir
+                : (typeof args.metadata.workdir === 'string' ? args.metadata.workdir : undefined)),
+        requestId: args.requestId
+    };
+}
+function extractUserAndToolSignals(requestBody) {
+    const messages = Array.isArray(requestBody.messages) ? requestBody.messages : [];
+    const lastUser = [...messages]
+        .reverse()
+        .find((entry) => entry && typeof entry === 'object' && entry.role === 'user');
+    const userText = typeof lastUser?.content === 'string' ? String(lastUser.content) : '';
+    const lastMessage = messages.length > 0 ? messages[messages.length - 1] : undefined;
+    const lastTool = lastMessage && typeof lastMessage === 'object' && !Array.isArray(lastMessage)
+        ? lastMessage
+        : undefined;
+    const lastToolRole = typeof lastTool?.role === 'string' ? lastTool.role : '';
+    const lastToolName = typeof lastTool?.name === 'string' ? String(lastTool.name).trim() : '';
+    return {
+        userText,
+        hasClockDirective: userText.includes('<**clock:{') && userText.includes('}**>'),
+        continueExecutionToolCalled: lastToolRole === 'tool' && lastToolName === 'continue_execution'
+    };
+}
+export function resolveStopMessageClientInjectReadiness(metadata) {
+    const explicitClientInjectReadyRaw = metadata.clientInjectReady ?? metadata.client_inject_ready;
+    const explicitClientInjectReady = explicitClientInjectReadyRaw === true
+        ? true
+        : explicitClientInjectReadyRaw === false
+            ? false
+            : (typeof explicitClientInjectReadyRaw === 'string'
+                ? (explicitClientInjectReadyRaw.trim().toLowerCase() === 'true'
+                    ? true
+                    : (explicitClientInjectReadyRaw.trim().toLowerCase() === 'false' ? false : undefined))
+                : undefined);
+    const explicitReason = typeof metadata.clientInjectReason === 'string'
+        ? metadata.clientInjectReason.trim()
+        : (typeof metadata.client_inject_reason === 'string' ? metadata.client_inject_reason.trim() : '');
+    if (explicitClientInjectReady === false && shouldTreatExplicitUnreadyAsHardBlock(explicitReason)) {
+        return { ready: false, reason: explicitReason || 'client_inject_unready' };
+    }
+    const tmuxSessionId = normalizeInjectToken(metadata.clientTmuxSessionId) ||
+        normalizeInjectToken(metadata.client_tmux_session_id) ||
+        normalizeInjectToken(metadata.tmuxSessionId);
+    const sessionScope = resolveInjectConversationSessionId(metadata);
+    const daemonId = normalizeInjectToken(metadata.clientDaemonId) ||
+        normalizeInjectToken(metadata.client_daemon_id) ||
+        normalizeInjectToken(metadata.clockDaemonId) ||
+        normalizeInjectToken(metadata.clockClientDaemonId);
+    const workdir = resolveInjectWorkdir(metadata);
+    const clientType = normalizeInjectToken(metadata.clockClientType) || normalizeInjectToken(metadata.clientType);
+    if (tmuxSessionId) {
+        return { ready: true, reason: 'tmux_direct', tmuxSessionId, ...(sessionScope ? { sessionScope } : {}) };
+    }
+    void daemonId;
+    void workdir;
+    void clientType;
+    return {
+        ready: false,
+        reason: 'tmux_session_required',
+        ...(sessionScope ? { sessionScope } : {})
+    };
+}
+export async function runClientInjectionFlowBeforeReenter(args) {
+    const clientInjectOnlyRaw = args.nestedMetadata.clientInjectOnly;
+    const clientInjectOnly = clientInjectOnlyRaw === true ||
+        (typeof clientInjectOnlyRaw === 'string' && clientInjectOnlyRaw.trim().toLowerCase() === 'true');
+    const clientInjectText = typeof args.nestedMetadata.clientInjectText === 'string' ? args.nestedMetadata.clientInjectText.trim() : '';
+    const clientInjectSource = typeof args.nestedMetadata.clientInjectSource === 'string' && args.nestedMetadata.clientInjectSource.trim()
+        ? args.nestedMetadata.clientInjectSource.trim()
+        : 'servertool.client_inject';
+    const injectTarget = buildInjectTargetFromMetadata({
+        metadata: args.nestedMetadata,
+        requestId: args.requestId
+    });
+    const signals = extractUserAndToolSignals(args.requestBody);
+    bindClockConversationSession(args.nestedMetadata);
+    const resolveStrictTarget = (source) => resolveStrictClientInjectTarget({
+        tmuxSessionId: injectTarget.tmuxSessionId,
+        conversationSessionId: typeof args.nestedMetadata.stopMessageClientInjectSessionScope === 'string'
+            ? args.nestedMetadata.stopMessageClientInjectSessionScope
+            : typeof args.nestedMetadata.stopMessageClientInjectScope === 'string'
+                ? args.nestedMetadata.stopMessageClientInjectScope
+                : undefined,
+        clientInjectReady: args.nestedMetadata.clientInjectReady ?? args.nestedMetadata.client_inject_ready,
+        clientInjectReason: args.nestedMetadata.clientInjectReason ?? args.nestedMetadata.client_inject_reason,
+        requestId: args.requestId,
+        source
+    });
+    if (clientInjectOnly) {
+        const strictTarget = resolveStrictTarget(clientInjectSource);
+        await injectClientPromptStrict({
+            tmuxSessionId: strictTarget.tmuxSessionId,
+            sessionScope: strictTarget.sessionScope,
+            ...(injectTarget.tmuxTarget ? { tmuxTarget: injectTarget.tmuxTarget } : {}),
+            ...(injectTarget.clientType ? { clientType: injectTarget.clientType } : {}),
+            workdir: injectTarget.workdir,
+            requestId: injectTarget.requestId,
+            text: clientInjectText || signals.userText || '继续执行',
+            source: clientInjectSource
+        });
+        return { clientInjectOnlyHandled: true };
+    }
+    if (signals.hasClockDirective) {
+        const strictTarget = resolveStrictTarget('servertool.clock');
+        await injectClientPromptStrict({
+            tmuxSessionId: strictTarget.tmuxSessionId,
+            sessionScope: strictTarget.sessionScope,
+            ...(injectTarget.tmuxTarget ? { tmuxTarget: injectTarget.tmuxTarget } : {}),
+            ...(injectTarget.clientType ? { clientType: injectTarget.clientType } : {}),
+            workdir: injectTarget.workdir,
+            requestId: injectTarget.requestId,
+            text: signals.userText,
+            source: 'servertool.clock'
+        });
+    }
+    if (signals.continueExecutionToolCalled) {
+        const strictTarget = resolveStrictTarget('servertool.continue_execution');
+        await injectClientPromptStrict({
+            tmuxSessionId: strictTarget.tmuxSessionId,
+            sessionScope: strictTarget.sessionScope,
+            ...(injectTarget.tmuxTarget ? { tmuxTarget: injectTarget.tmuxTarget } : {}),
+            ...(injectTarget.clientType ? { clientType: injectTarget.clientType } : {}),
+            workdir: injectTarget.workdir,
+            requestId: injectTarget.requestId,
+            text: '继续执行',
+            source: 'servertool.continue_execution'
+        });
+    }
+    if (signals.hasClockDirective || signals.continueExecutionToolCalled) {
+        return { clientInjectOnlyHandled: true };
+    }
+    return { clientInjectOnlyHandled: false };
+}
+//# sourceMappingURL=client-injection-flow.js.map

package/dist/server/runtime/http-server/executor/client-injection-flow.js.map

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

package/dist/server/runtime/http-server/executor/index.d.ts

@@ -7,5 +7,5 @@ export { firstNonEmptyString, firstFiniteNumber, extractStatusCodeFromError, res
 export { describeRetryReason, shouldRetryProviderError, waitBeforeRetry, RETRYABLE_SSE_ERROR_CODE_HINTS, RETRYABLE_SSE_MESSAGE_HINTS, isRetryableSseWrapperError, resolveMaxProviderAttempts, resolveAntigravityMaxProviderAttempts } from './retry-engine.js';
 export { type SseWrapperErrorInfo, extractSseWrapperError } from './sse-error-handler.js';
 export { isAntigravityProviderKey, isGoogleAccountVerificationRequiredError, isAntigravityReauthRequired403, extractRetryErrorSignature, shouldRotateAntigravityAliasOnRetry, injectAntigravityRetrySignal } from './antigravity-detector.js';
-export { type UsageMetrics, extractUsageFromResult, normalizeUsage, extractEstimatedInputTokens, reconcileUsageWithEstimate, patchUsageCandidate, mergeUsageMetrics, buildUsageLogText } from './usage-aggregator.js';
+export { type UsageMetrics, extractUsageFromResult, normalizeUsage, mergeUsageMetrics, buildUsageLogText } from './usage-aggregator.js';
 export { isUsageLoggingEnabled, isVerboseErrorLoggingEnabled } from './env-config.js';

package/dist/server/runtime/http-server/executor/index.js

@@ -12,7 +12,7 @@ export { extractSseWrapperError } from './sse-error-handler.js';
 // Antigravity detection
 export { isAntigravityProviderKey, isGoogleAccountVerificationRequiredError, isAntigravityReauthRequired403, extractRetryErrorSignature, shouldRotateAntigravityAliasOnRetry, injectAntigravityRetrySignal } from './antigravity-detector.js';
 // Usage aggregation
-export { extractUsageFromResult, normalizeUsage, extractEstimatedInputTokens, reconcileUsageWithEstimate, patchUsageCandidate, mergeUsageMetrics, buildUsageLogText } from './usage-aggregator.js';
+export { extractUsageFromResult, normalizeUsage, mergeUsageMetrics, buildUsageLogText } from './usage-aggregator.js';
 // Environment configuration
 export { isUsageLoggingEnabled, isVerboseErrorLoggingEnabled } from './env-config.js';
 //# sourceMappingURL=index.js.map

package/dist/server/runtime/http-server/executor/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY;AACZ,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,0BAA0B,EAC1B,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,eAAe;AACf,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,eAAe,EACf,8BAA8B,EAC9B,2BAA2B,EAC3B,0BAA0B,EAC1B,0BAA0B,EAC1B,qCAAqC,EACtC,MAAM,mBAAmB,CAAC;AAE3B,qBAAqB;AACrB,OAAO,EAEL,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAEhC,wBAAwB;AACxB,OAAO,EACL,wBAAwB,EACxB,wCAAwC,EACxC,8BAA8B,EAC9B,0BAA0B,EAC1B,mCAAmC,EACnC,4BAA4B,EAC7B,MAAM,2BAA2B,CAAC;AAEnC,oBAAoB;AACpB,OAAO,EAEL,sBAAsB,EACtB,cAAc,EACd,2BAA2B,EAC3B,0BAA0B,EAC1B,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAE/B,4BAA4B;AAC5B,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY;AACZ,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,0BAA0B,EAC1B,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,eAAe;AACf,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,eAAe,EACf,8BAA8B,EAC9B,2BAA2B,EAC3B,0BAA0B,EAC1B,0BAA0B,EAC1B,qCAAqC,EACtC,MAAM,mBAAmB,CAAC;AAE3B,qBAAqB;AACrB,OAAO,EAEL,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAEhC,wBAAwB;AACxB,OAAO,EACL,wBAAwB,EACxB,wCAAwC,EACxC,8BAA8B,EAC9B,0BAA0B,EAC1B,mCAAmC,EACnC,4BAA4B,EAC7B,MAAM,2BAA2B,CAAC;AAEnC,oBAAoB;AACpB,OAAO,EAEL,sBAAsB,EACtB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAE/B,4BAA4B;AAC5B,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC"}