tailii-host 0.1.1 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -10
- package/dist/{broker.d.ts → approval/broker.d.ts} +9 -5
- package/dist/{broker.js → approval/broker.js} +42 -6
- package/dist/approval/broker.js.map +1 -0
- package/dist/{hook.d.ts → approval/hook.d.ts} +48 -7
- package/dist/{hook.js → approval/hook.js} +359 -50
- package/dist/approval/hook.js.map +1 -0
- package/dist/backend/herdr.d.ts +226 -0
- package/dist/backend/herdr.js +749 -0
- package/dist/backend/herdr.js.map +1 -0
- package/dist/backend/sessionBackend.d.ts +81 -0
- package/dist/backend/sessionBackend.js +114 -0
- package/dist/backend/sessionBackend.js.map +1 -0
- package/dist/backend/tmux.d.ts +125 -0
- package/dist/backend/tmux.js +392 -0
- package/dist/backend/tmux.js.map +1 -0
- package/dist/{chatTailController.d.ts → chat/chatTailController.d.ts} +29 -6
- package/dist/{chatTailController.js → chat/chatTailController.js} +94 -18
- package/dist/chat/chatTailController.js.map +1 -0
- package/dist/{imageService.d.ts → chat/imageService.d.ts} +12 -1
- package/dist/{imageService.js → chat/imageService.js} +39 -11
- package/dist/chat/imageService.js.map +1 -0
- package/dist/chat/remoteQuestionMonitor.d.ts +27 -0
- package/dist/chat/remoteQuestionMonitor.js +128 -0
- package/dist/chat/remoteQuestionMonitor.js.map +1 -0
- package/dist/chat/subagentTailer.d.ts +30 -0
- package/dist/chat/subagentTailer.js +704 -0
- package/dist/chat/subagentTailer.js.map +1 -0
- package/dist/chat/subagentTranscript.d.ts +20 -0
- package/dist/chat/subagentTranscript.js +273 -0
- package/dist/chat/subagentTranscript.js.map +1 -0
- package/dist/{transcriptTailer.d.ts → chat/transcriptTailer.d.ts} +12 -1
- package/dist/{transcriptTailer.js → chat/transcriptTailer.js} +183 -10
- package/dist/chat/transcriptTailer.js.map +1 -0
- package/dist/cli.js +15 -10
- package/dist/cli.js.map +1 -1
- package/dist/codex/codexAccountUsage.d.ts +22 -0
- package/dist/codex/codexAccountUsage.js +128 -0
- package/dist/codex/codexAccountUsage.js.map +1 -0
- package/dist/codex/codexAppServer.d.ts +166 -0
- package/dist/codex/codexAppServer.js +1297 -0
- package/dist/codex/codexAppServer.js.map +1 -0
- package/dist/codex/codexNativeTurnController.d.ts +153 -0
- package/dist/codex/codexNativeTurnController.js +673 -0
- package/dist/codex/codexNativeTurnController.js.map +1 -0
- package/dist/codex/codexRolloutTailer.d.ts +100 -0
- package/dist/codex/codexRolloutTailer.js +568 -0
- package/dist/codex/codexRolloutTailer.js.map +1 -0
- package/dist/{codexSessionStore.d.ts → codex/codexSessionStore.d.ts} +10 -2
- package/dist/{codexSessionStore.js → codex/codexSessionStore.js} +184 -15
- package/dist/codex/codexSessionStore.js.map +1 -0
- package/dist/codex/codexSubagentTracker.d.ts +21 -0
- package/dist/codex/codexSubagentTracker.js +281 -0
- package/dist/codex/codexSubagentTracker.js.map +1 -0
- package/dist/codex/codexToolActivity.d.ts +69 -0
- package/dist/codex/codexToolActivity.js +425 -0
- package/dist/codex/codexToolActivity.js.map +1 -0
- package/dist/{codexUsage.d.ts → codex/codexUsage.d.ts} +1 -1
- package/dist/{codexUsage.js → codex/codexUsage.js} +19 -26
- package/dist/codex/codexUsage.js.map +1 -0
- package/dist/commands/doctor.d.ts +65 -0
- package/dist/commands/doctor.js +425 -0
- package/dist/commands/doctor.js.map +1 -0
- package/dist/{hookSettings.d.ts → commands/hookSettings.d.ts} +14 -1
- package/dist/{hookSettings.js → commands/hookSettings.js} +96 -12
- package/dist/commands/hookSettings.js.map +1 -0
- package/dist/{kick.js → commands/kick.js} +16 -1
- package/dist/commands/kick.js.map +1 -0
- package/dist/{launch.d.ts → commands/launch.d.ts} +67 -5
- package/dist/commands/launch.js +716 -0
- package/dist/commands/launch.js.map +1 -0
- package/dist/commands/legacyHomeMigration.js.map +1 -0
- package/dist/{pairingCode.d.ts → commands/pairingCode.d.ts} +29 -2
- package/dist/{pairingCode.js → commands/pairingCode.js} +120 -11
- package/dist/commands/pairingCode.js.map +1 -0
- package/dist/{pushTokenCommand.d.ts → commands/pushTokenCommand.d.ts} +1 -1
- package/dist/{pushTokenCommand.js → commands/pushTokenCommand.js} +2 -2
- package/dist/commands/pushTokenCommand.js.map +1 -0
- package/dist/{setup.d.ts → commands/setup.d.ts} +17 -6
- package/dist/{setup.js → commands/setup.js} +133 -75
- package/dist/commands/setup.js.map +1 -0
- package/dist/engine/context.d.ts +145 -0
- package/dist/engine/context.js +184 -0
- package/dist/engine/context.js.map +1 -0
- package/dist/engine/engine.d.ts +121 -0
- package/dist/engine/engine.js +799 -0
- package/dist/engine/engine.js.map +1 -0
- package/dist/engine/handlers/accountUsage.d.ts +53 -0
- package/dist/engine/handlers/accountUsage.js +203 -0
- package/dist/engine/handlers/accountUsage.js.map +1 -0
- package/dist/engine/handlers/claudeModels.d.ts +2 -0
- package/dist/engine/handlers/claudeModels.js +23 -0
- package/dist/engine/handlers/claudeModels.js.map +1 -0
- package/dist/engine/handlers/codex.d.ts +2 -0
- package/dist/engine/handlers/codex.js +97 -0
- package/dist/engine/handlers/codex.js.map +1 -0
- package/dist/engine/handlers/conversation.d.ts +2 -0
- package/dist/engine/handlers/conversation.js +259 -0
- package/dist/engine/handlers/conversation.js.map +1 -0
- package/dist/engine/handlers/core.d.ts +2 -0
- package/dist/engine/handlers/core.js +66 -0
- package/dist/engine/handlers/core.js.map +1 -0
- package/dist/engine/handlers/git.d.ts +2 -0
- package/dist/engine/handlers/git.js +127 -0
- package/dist/engine/handlers/git.js.map +1 -0
- package/dist/engine/handlers/index.d.ts +2 -0
- package/dist/engine/handlers/index.js +32 -0
- package/dist/engine/handlers/index.js.map +1 -0
- package/dist/engine/handlers/mode.d.ts +2 -0
- package/dist/engine/handlers/mode.js +194 -0
- package/dist/engine/handlers/mode.js.map +1 -0
- package/dist/engine/handlers/officialApps.d.ts +2 -0
- package/dist/engine/handlers/officialApps.js +79 -0
- package/dist/engine/handlers/officialApps.js.map +1 -0
- package/dist/engine/handlers/preview.d.ts +2 -0
- package/dist/engine/handlers/preview.js +59 -0
- package/dist/engine/handlers/preview.js.map +1 -0
- package/dist/engine/handlers/session.d.ts +2 -0
- package/dist/engine/handlers/session.js +385 -0
- package/dist/engine/handlers/session.js.map +1 -0
- package/dist/engine/handlers/usage.d.ts +2 -0
- package/dist/engine/handlers/usage.js +96 -0
- package/dist/engine/handlers/usage.js.map +1 -0
- package/dist/engine/handlers/workspace.d.ts +2 -0
- package/dist/engine/handlers/workspace.js +110 -0
- package/dist/engine/handlers/workspace.js.map +1 -0
- package/dist/engine/slashCommands.d.ts +3 -0
- package/dist/engine/slashCommands.js +211 -0
- package/dist/engine/slashCommands.js.map +1 -0
- package/dist/hub/engineRelaySocket.d.ts +58 -0
- package/dist/hub/engineRelaySocket.js +161 -0
- package/dist/hub/engineRelaySocket.js.map +1 -0
- package/dist/hub/hubClient.d.ts +28 -0
- package/dist/hub/hubClient.js +187 -0
- package/dist/hub/hubClient.js.map +1 -0
- package/dist/hub/hubDaemon.d.ts +69 -0
- package/dist/hub/hubDaemon.js +466 -0
- package/dist/hub/hubDaemon.js.map +1 -0
- package/dist/hub/hubProtocol.d.ts +161 -0
- package/dist/hub/hubProtocol.js +379 -0
- package/dist/hub/hubProtocol.js.map +1 -0
- package/dist/hub/panePreviewPump.d.ts +65 -0
- package/dist/hub/panePreviewPump.js +187 -0
- package/dist/hub/panePreviewPump.js.map +1 -0
- package/dist/hub/questionInjection.d.ts +19 -0
- package/dist/hub/questionInjection.js +126 -0
- package/dist/hub/questionInjection.js.map +1 -0
- package/dist/hub/reaper.d.ts +74 -0
- package/dist/hub/reaper.js +333 -0
- package/dist/hub/reaper.js.map +1 -0
- package/dist/hub/sessionHub.d.ts +203 -0
- package/dist/hub/sessionHub.js +1862 -0
- package/dist/hub/sessionHub.js.map +1 -0
- package/dist/protocol/common.d.ts +18 -0
- package/dist/protocol/common.js +78 -0
- package/dist/protocol/common.js.map +1 -0
- package/dist/protocol/decode.d.ts +3 -0
- package/dist/protocol/decode.js +1036 -0
- package/dist/protocol/decode.js.map +1 -0
- package/dist/protocol/encode.d.ts +3 -0
- package/dist/protocol/encode.js +84 -0
- package/dist/protocol/encode.js.map +1 -0
- package/dist/protocol/messages.d.ts +1002 -0
- package/dist/protocol/messages.js +8 -0
- package/dist/protocol/messages.js.map +1 -0
- package/dist/protocol.d.ts +4 -329
- package/dist/protocol.js +13 -531
- package/dist/protocol.js.map +1 -1
- package/dist/push/apnsConfigStore.js.map +1 -0
- package/dist/push/apnsJwtProvider.js.map +1 -0
- package/dist/{apnsSender.js.map → push/apnsSender.js.map} +1 -1
- package/dist/{approvalPushNotifier.js → push/approvalPushNotifier.js} +1 -1
- package/dist/push/approvalPushNotifier.js.map +1 -0
- package/dist/push/deviceTokenStore.js.map +1 -0
- package/dist/{pushTypes.js → push/pushTypes.js} +1 -1
- package/dist/push/pushTypes.js.map +1 -0
- package/dist/push/sendLog.js.map +1 -0
- package/dist/services/accountIdentity.d.ts +44 -0
- package/dist/services/accountIdentity.js +184 -0
- package/dist/services/accountIdentity.js.map +1 -0
- package/dist/services/claudeCredentialRefresh.d.ts +30 -0
- package/dist/services/claudeCredentialRefresh.js +345 -0
- package/dist/services/claudeCredentialRefresh.js.map +1 -0
- package/dist/services/claudeModelCatalog.d.ts +21 -0
- package/dist/services/claudeModelCatalog.js +181 -0
- package/dist/services/claudeModelCatalog.js.map +1 -0
- package/dist/{dirLister.d.ts → services/dirLister.d.ts} +9 -4
- package/dist/services/dirLister.js +169 -0
- package/dist/services/dirLister.js.map +1 -0
- package/dist/services/fileService.d.ts +10 -0
- package/dist/services/fileService.js +123 -0
- package/dist/services/fileService.js.map +1 -0
- package/dist/services/gitService.d.ts +79 -0
- package/dist/services/gitService.js +648 -0
- package/dist/services/gitService.js.map +1 -0
- package/dist/services/hostVersions.d.ts +38 -0
- package/dist/services/hostVersions.js +120 -0
- package/dist/services/hostVersions.js.map +1 -0
- package/dist/services/officialApps.d.ts +148 -0
- package/dist/services/officialApps.js +1079 -0
- package/dist/services/officialApps.js.map +1 -0
- package/dist/services/planUsageFetcher.d.ts +119 -0
- package/dist/services/planUsageFetcher.js +357 -0
- package/dist/services/planUsageFetcher.js.map +1 -0
- package/dist/services/previewServer.d.ts +31 -0
- package/dist/services/previewServer.js +233 -0
- package/dist/services/previewServer.js.map +1 -0
- package/dist/services/quicGateway.d.ts +143 -0
- package/dist/services/quicGateway.js +292 -0
- package/dist/services/quicGateway.js.map +1 -0
- package/dist/services/serveService.d.ts +50 -0
- package/dist/services/serveService.js +302 -0
- package/dist/services/serveService.js.map +1 -0
- package/dist/services/usageAggregator.js.map +1 -0
- package/dist/sessions/claudeSessionStore.d.ts +80 -0
- package/dist/sessions/claudeSessionStore.js +477 -0
- package/dist/sessions/claudeSessionStore.js.map +1 -0
- package/dist/sessions/heartbeat.d.ts +24 -0
- package/dist/sessions/heartbeat.js +86 -0
- package/dist/sessions/heartbeat.js.map +1 -0
- package/dist/sessions/liveSessionJoin.d.ts +20 -0
- package/dist/sessions/liveSessionJoin.js +80 -0
- package/dist/sessions/liveSessionJoin.js.map +1 -0
- package/dist/sessions/sessionActivityProvider.d.ts +14 -0
- package/dist/sessions/sessionActivityProvider.js +57 -0
- package/dist/sessions/sessionActivityProvider.js.map +1 -0
- package/dist/{sessionListService.d.ts → sessions/sessionListService.d.ts} +3 -3
- package/dist/{sessionListService.js → sessions/sessionListService.js} +23 -6
- package/dist/sessions/sessionListService.js.map +1 -0
- package/dist/{sessionMetadataStore.d.ts → sessions/sessionMetadataStore.d.ts} +18 -0
- package/dist/{sessionMetadataStore.js → sessions/sessionMetadataStore.js} +36 -1
- package/dist/sessions/sessionMetadataStore.js.map +1 -0
- package/dist/{sessionSearch.d.ts → sessions/sessionSearch.d.ts} +1 -1
- package/dist/sessions/sessionSearch.js.map +1 -0
- package/dist/shared/hostDisplayName.d.ts +11 -0
- package/dist/shared/hostDisplayName.js +50 -0
- package/dist/shared/hostDisplayName.js.map +1 -0
- package/dist/{lineWriter.d.ts → shared/lineWriter.d.ts} +1 -1
- package/dist/{lineWriter.js → shared/lineWriter.js} +1 -1
- package/dist/shared/lineWriter.js.map +1 -0
- package/dist/{observationLog.js.map → shared/observationLog.js.map} +1 -1
- package/dist/{paths.d.ts → shared/paths.d.ts} +7 -0
- package/dist/{paths.js → shared/paths.js} +9 -0
- package/dist/shared/paths.js.map +1 -0
- package/dist/shared/permissionMode.d.ts +10 -0
- package/dist/shared/permissionMode.js +51 -0
- package/dist/shared/permissionMode.js.map +1 -0
- package/dist/shared/skillInjection.d.ts +9 -0
- package/dist/shared/skillInjection.js +16 -0
- package/dist/shared/skillInjection.js.map +1 -0
- package/dist/shared/sleep.js.map +1 -0
- package/dist/{socketPath.d.ts → shared/socketPath.d.ts} +4 -0
- package/dist/{socketPath.js → shared/socketPath.js} +22 -0
- package/dist/shared/socketPath.js.map +1 -0
- package/dist/shared/version.js.map +1 -0
- package/package.json +13 -7
- package/dist/apnsConfigStore.js.map +0 -1
- package/dist/apnsJwtProvider.js.map +0 -1
- package/dist/approvalPushNotifier.js.map +0 -1
- package/dist/broker.js.map +0 -1
- package/dist/chatTailController.js.map +0 -1
- package/dist/claudeSessionStore.d.ts +0 -15
- package/dist/claudeSessionStore.js +0 -201
- package/dist/claudeSessionStore.js.map +0 -1
- package/dist/codexRolloutTailer.d.ts +0 -56
- package/dist/codexRolloutTailer.js +0 -303
- package/dist/codexRolloutTailer.js.map +0 -1
- package/dist/codexSessionStore.js.map +0 -1
- package/dist/codexUsage.js.map +0 -1
- package/dist/deviceTokenStore.js.map +0 -1
- package/dist/dirLister.js +0 -98
- package/dist/dirLister.js.map +0 -1
- package/dist/doctor.d.ts +0 -36
- package/dist/doctor.js +0 -162
- package/dist/doctor.js.map +0 -1
- package/dist/engine.d.ts +0 -85
- package/dist/engine.js +0 -962
- package/dist/engine.js.map +0 -1
- package/dist/hook.js.map +0 -1
- package/dist/hookSettings.js.map +0 -1
- package/dist/idleReaper.d.ts +0 -13
- package/dist/idleReaper.js +0 -30
- package/dist/idleReaper.js.map +0 -1
- package/dist/imageService.js.map +0 -1
- package/dist/kick.js.map +0 -1
- package/dist/launch.js +0 -396
- package/dist/launch.js.map +0 -1
- package/dist/legacyHomeMigration.js.map +0 -1
- package/dist/lineWriter.js.map +0 -1
- package/dist/mdnsAdvertiser.d.ts +0 -46
- package/dist/mdnsAdvertiser.js +0 -268
- package/dist/mdnsAdvertiser.js.map +0 -1
- package/dist/pairingCode.js.map +0 -1
- package/dist/paths.js.map +0 -1
- package/dist/permissionMode.d.ts +0 -8
- package/dist/permissionMode.js +0 -32
- package/dist/permissionMode.js.map +0 -1
- package/dist/planUsageFetcher.d.ts +0 -35
- package/dist/planUsageFetcher.js +0 -172
- package/dist/planUsageFetcher.js.map +0 -1
- package/dist/pushTokenCommand.js.map +0 -1
- package/dist/pushTypes.js.map +0 -1
- package/dist/sendLog.js.map +0 -1
- package/dist/sessionActivityProvider.d.ts +0 -7
- package/dist/sessionActivityProvider.js +0 -44
- package/dist/sessionActivityProvider.js.map +0 -1
- package/dist/sessionIdleTracker.d.ts +0 -19
- package/dist/sessionIdleTracker.js +0 -42
- package/dist/sessionIdleTracker.js.map +0 -1
- package/dist/sessionListService.js.map +0 -1
- package/dist/sessionMetadataStore.js.map +0 -1
- package/dist/sessionSearch.js.map +0 -1
- package/dist/setup.js.map +0 -1
- package/dist/sleep.js.map +0 -1
- package/dist/socketPath.js.map +0 -1
- package/dist/subagentTailer.d.ts +0 -15
- package/dist/subagentTailer.js +0 -399
- package/dist/subagentTailer.js.map +0 -1
- package/dist/tmux.d.ts +0 -62
- package/dist/tmux.js +0 -163
- package/dist/tmux.js.map +0 -1
- package/dist/transcriptTailer.js.map +0 -1
- package/dist/usageAggregator.js.map +0 -1
- package/dist/version.js.map +0 -1
- /package/dist/{kick.d.ts → commands/kick.d.ts} +0 -0
- /package/dist/{legacyHomeMigration.d.ts → commands/legacyHomeMigration.d.ts} +0 -0
- /package/dist/{legacyHomeMigration.js → commands/legacyHomeMigration.js} +0 -0
- /package/dist/{apnsConfigStore.d.ts → push/apnsConfigStore.d.ts} +0 -0
- /package/dist/{apnsConfigStore.js → push/apnsConfigStore.js} +0 -0
- /package/dist/{apnsJwtProvider.d.ts → push/apnsJwtProvider.d.ts} +0 -0
- /package/dist/{apnsJwtProvider.js → push/apnsJwtProvider.js} +0 -0
- /package/dist/{apnsSender.d.ts → push/apnsSender.d.ts} +0 -0
- /package/dist/{apnsSender.js → push/apnsSender.js} +0 -0
- /package/dist/{approvalPushNotifier.d.ts → push/approvalPushNotifier.d.ts} +0 -0
- /package/dist/{deviceTokenStore.d.ts → push/deviceTokenStore.d.ts} +0 -0
- /package/dist/{deviceTokenStore.js → push/deviceTokenStore.js} +0 -0
- /package/dist/{pushTypes.d.ts → push/pushTypes.d.ts} +0 -0
- /package/dist/{sendLog.d.ts → push/sendLog.d.ts} +0 -0
- /package/dist/{sendLog.js → push/sendLog.js} +0 -0
- /package/dist/{usageAggregator.d.ts → services/usageAggregator.d.ts} +0 -0
- /package/dist/{usageAggregator.js → services/usageAggregator.js} +0 -0
- /package/dist/{sessionSearch.js → sessions/sessionSearch.js} +0 -0
- /package/dist/{observationLog.d.ts → shared/observationLog.d.ts} +0 -0
- /package/dist/{observationLog.js → shared/observationLog.js} +0 -0
- /package/dist/{sleep.d.ts → shared/sleep.d.ts} +0 -0
- /package/dist/{sleep.js → shared/sleep.js} +0 -0
- /package/dist/{version.d.ts → shared/version.d.ts} +0 -0
- /package/dist/{version.js → shared/version.js} +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/engine/engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import type { ClaudeAccountUsage, CodexAccountUsage } from "../../protocol/messages.js";
|
|
2
|
+
import type { HandlerRegistry } from "../context.js";
|
|
3
|
+
/** Claude 側 TTL(ms)。使用量 API は分解能が粗く、2 分で十分新しい。 */
|
|
4
|
+
export declare const CLAUDE_ACCOUNT_USAGE_TTL_MS = 120000;
|
|
5
|
+
/** Codex 側 TTL(ms)。App Server 経由なので Claude より短くできる。 */
|
|
6
|
+
export declare const CODEX_ACCOUNT_USAGE_TTL_MS = 60000;
|
|
7
|
+
/** Claude 側の取得失敗時に返す理由文(iOS はこれをそのままカードへ出す)。 */
|
|
8
|
+
export declare const CLAUDE_ACCOUNT_USAGE_ERROR = "Claude \u306E\u4F7F\u7528\u91CF\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08OAuth \u30C8\u30FC\u30AF\u30F3\u7121\u52B9\u307E\u305F\u306F\u30AA\u30D5\u30E9\u30A4\u30F3\uFF09\u3002";
|
|
9
|
+
/** Codex 側の取得失敗時に返す理由文。 */
|
|
10
|
+
export declare const CODEX_ACCOUNT_USAGE_ERROR = "Codex \u306E\u4F7F\u7528\u91CF\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08Codex App Server \u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\uFF09\u3002";
|
|
11
|
+
export interface AccountUsageHandlerOptions {
|
|
12
|
+
/** 現在時刻(ms)。テストは固定値/進行を注入して TTL を決定化する。 */
|
|
13
|
+
now?: () => number;
|
|
14
|
+
claudeTtlMs?: number;
|
|
15
|
+
codexTtlMs?: number;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* account_usage ハンドラを作る。TTL メモを閉包に持つため、テストは独自インスタンスを
|
|
19
|
+
* 生成して互いに干渉させない(ENGINE_HANDLERS 側は engine プロセス全体で 1 つを共有する)。
|
|
20
|
+
*/
|
|
21
|
+
export declare function createAccountUsageHandlers(options?: AccountUsageHandlerOptions): HandlerRegistry;
|
|
22
|
+
/** Claude 側の「使用率 / リセット時刻」の対応表(枠ごとにペアで落とすため)。 */
|
|
23
|
+
export declare const CLAUDE_WINDOW_KEYS: readonly [readonly ["fiveHourPercent", "fiveHourResetsAt"], readonly ["sevenDayPercent", "sevenDayResetsAt"], readonly ["premiumPercent", "premiumResetsAt"]];
|
|
24
|
+
/** Codex 側の「使用率 / リセット時刻」の対応表。 */
|
|
25
|
+
export declare const CODEX_WINDOW_KEYS: readonly [readonly ["fiveHourPercent", "fiveHourResetsAt"], readonly ["weeklyPercent", "weeklyResetsAt"]];
|
|
26
|
+
/** マスク済みアカウントを載せたコピーを返す(undefined なら素通し, 純ロジック)。 */
|
|
27
|
+
export declare function withAccount<T extends ClaudeAccountUsage | CodexAccountUsage>(usage: T, account: string | undefined): T;
|
|
28
|
+
/**
|
|
29
|
+
* リセット済み(`resetsAt <= now`)の枠を落とす(純ロジック, TESTABLE)。
|
|
30
|
+
*
|
|
31
|
+
* リセット後の % は「次の枠の実績」ではなく**前の枠の残骸**で、そのまま出すと嘘になる。
|
|
32
|
+
* 使用率とリセット時刻はペアで落とす(片方だけ残すと表示が壊れる)。
|
|
33
|
+
* `resetsAt` が無い/読めない枠は落とさない — 判定不能なだけで、古いとは限らない。
|
|
34
|
+
* 枠が全部落ちても `plan` / `account` は残す(カードは出て、枠行が無いだけになる)。
|
|
35
|
+
*/
|
|
36
|
+
export declare function dropExpiredWindows<T extends ClaudeAccountUsage | CodexAccountUsage>(usage: T, nowMs: number, windows: readonly (readonly [string, string])[]): T;
|
|
37
|
+
/**
|
|
38
|
+
* `PlanUsage`(OAuth 使用量 API)を wire の `ClaudeAccountUsage` へ写す(純ロジック, TESTABLE)。
|
|
39
|
+
* 全枠が null(= 何も読めなかった)なら null を返し、呼び出し側で claudeError へ落とす。
|
|
40
|
+
*/
|
|
41
|
+
export declare function toClaudeAccountUsage(plan: {
|
|
42
|
+
fiveHourUtilization: number | null;
|
|
43
|
+
fiveHourResetsAt: string | null;
|
|
44
|
+
sevenDayUtilization: number | null;
|
|
45
|
+
sevenDayResetsAt: string | null;
|
|
46
|
+
sevenDayFableUtilization: number | null;
|
|
47
|
+
sevenDayFableResetsAt: string | null;
|
|
48
|
+
/** credentials 由来の契約種別(無くても使用量は表示できるので optional)。 */
|
|
49
|
+
subscriptionType?: string | null;
|
|
50
|
+
rateLimitTier?: string | null;
|
|
51
|
+
/** 使用量取得に成功した同じ OAuth token のマスク済みアカウント。 */
|
|
52
|
+
account?: string | null;
|
|
53
|
+
} | null): ClaudeAccountUsage | null;
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
// engine/handlers/accountUsage.ts
|
|
2
|
+
// アカウント使用量(account-usage): Claude(OAuth 使用量 API)と Codex(App Server の
|
|
3
|
+
// account/rateLimits/read)の使用率を 1 応答へまとめて返す。session 非依存(会話を 1 件も
|
|
4
|
+
// 開いていない一覧画面から呼ばれるため)。
|
|
5
|
+
//
|
|
6
|
+
// 設計:
|
|
7
|
+
// - agent ごとに独立。片方が失敗しても、もう片方は必ず表示できるようにする
|
|
8
|
+
// (失敗側は object を省略し `claudeError` / `codexError` に理由文を載せる)。
|
|
9
|
+
// - error 封筒は使わない。「両方失敗」も正常な応答形として返す(シートが空にならない)。
|
|
10
|
+
// - agent 別 TTL メモを持ち、シートの連打で外部 API を叩かない。TTL 内は前回値を返し、
|
|
11
|
+
// `fetchedAt` は実際に取得した時刻のまま(最も古い方)を載せる — 表示が「いつの値か」で嘘をつかない。
|
|
12
|
+
// - 成功だけでなく失敗もキャッシュする(TTL の目的が外部 API の保護なので、失敗連打も止める)。
|
|
13
|
+
/** Claude 側 TTL(ms)。使用量 API は分解能が粗く、2 分で十分新しい。 */
|
|
14
|
+
export const CLAUDE_ACCOUNT_USAGE_TTL_MS = 120_000;
|
|
15
|
+
/** Codex 側 TTL(ms)。App Server 経由なので Claude より短くできる。 */
|
|
16
|
+
export const CODEX_ACCOUNT_USAGE_TTL_MS = 60_000;
|
|
17
|
+
/** Claude 側の取得失敗時に返す理由文(iOS はこれをそのままカードへ出す)。 */
|
|
18
|
+
export const CLAUDE_ACCOUNT_USAGE_ERROR = "Claude の使用量を取得できませんでした(OAuth トークン無効またはオフライン)。";
|
|
19
|
+
/** Codex 側の取得失敗時に返す理由文。 */
|
|
20
|
+
export const CODEX_ACCOUNT_USAGE_ERROR = "Codex の使用量を取得できませんでした(Codex App Server に接続できません)。";
|
|
21
|
+
/**
|
|
22
|
+
* Claude usage が同じ OAuth token で account 解決を試みた印。
|
|
23
|
+
* non-enumerable Symbol は JSON に出ず、dropExpiredWindows が加工後のコピーへ明示継承する。
|
|
24
|
+
*/
|
|
25
|
+
const CLAUDE_ACCOUNT_FROM_USAGE_TOKEN = Symbol("claudeAccountFromUsageToken");
|
|
26
|
+
/**
|
|
27
|
+
* account_usage ハンドラを作る。TTL メモを閉包に持つため、テストは独自インスタンスを
|
|
28
|
+
* 生成して互いに干渉させない(ENGINE_HANDLERS 側は engine プロセス全体で 1 つを共有する)。
|
|
29
|
+
*/
|
|
30
|
+
export function createAccountUsageHandlers(options = {}) {
|
|
31
|
+
const now = options.now ?? (() => Date.now());
|
|
32
|
+
const claudeTtlMs = options.claudeTtlMs ?? CLAUDE_ACCOUNT_USAGE_TTL_MS;
|
|
33
|
+
const codexTtlMs = options.codexTtlMs ?? CODEX_ACCOUNT_USAGE_TTL_MS;
|
|
34
|
+
let claudeCache = null;
|
|
35
|
+
let codexCache = null;
|
|
36
|
+
async function loadClaude(ctx) {
|
|
37
|
+
const at = now();
|
|
38
|
+
if (claudeCache !== null && at - claudeCache.atMs < claudeTtlMs)
|
|
39
|
+
return claudeCache;
|
|
40
|
+
let value = null;
|
|
41
|
+
try {
|
|
42
|
+
value = toClaudeAccountUsage(await ctx.planUsage());
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
value = null;
|
|
46
|
+
}
|
|
47
|
+
claudeCache = { atMs: at, value };
|
|
48
|
+
return claudeCache;
|
|
49
|
+
}
|
|
50
|
+
async function loadCodex(ctx) {
|
|
51
|
+
const at = now();
|
|
52
|
+
if (codexCache !== null && at - codexCache.atMs < codexTtlMs)
|
|
53
|
+
return codexCache;
|
|
54
|
+
let value = null;
|
|
55
|
+
try {
|
|
56
|
+
value = await ctx.codexAccountUsage();
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
value = null;
|
|
60
|
+
}
|
|
61
|
+
codexCache = { atMs: at, value };
|
|
62
|
+
return codexCache;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* ホストのバージョン・診断情報。CLI 更新や環境変更を refresh へ反映するため
|
|
66
|
+
* TTL メモには載せない。provider 側の診断 timeout 後は、取れた情報だけを返す。
|
|
67
|
+
*/
|
|
68
|
+
async function loadHost(ctx) {
|
|
69
|
+
try {
|
|
70
|
+
return await ctx.hostVersions();
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
/** ログイン中アカウント(マスク済み)。取れなくても使用量表示は続ける。 */
|
|
77
|
+
async function loadAccounts(ctx) {
|
|
78
|
+
try {
|
|
79
|
+
return await ctx.accountIdentity();
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
return {};
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return {
|
|
86
|
+
account_usage_request: async (message, ctx) => {
|
|
87
|
+
const { writer, state } = ctx;
|
|
88
|
+
const v = state.negotiatedVersion;
|
|
89
|
+
// 4 系統は独立。片方の失敗・遅延がもう片方を巻き込まないよう並行に取る。
|
|
90
|
+
const [claude, codex, host, accounts] = await Promise.all([
|
|
91
|
+
loadClaude(ctx),
|
|
92
|
+
loadCodex(ctx),
|
|
93
|
+
loadHost(ctx),
|
|
94
|
+
loadAccounts(ctx),
|
|
95
|
+
]);
|
|
96
|
+
// TTL メモの値は共有物。加工は必ずコピーの上で行う(キャッシュを汚さない)。
|
|
97
|
+
const nowMs = now();
|
|
98
|
+
const claudeValue = claude.value === null
|
|
99
|
+
? null
|
|
100
|
+
: dropExpiredWindows(withAccount(claude.value, accounts.claude), nowMs, CLAUDE_WINDOW_KEYS);
|
|
101
|
+
const codexValue = codex.value === null
|
|
102
|
+
? null
|
|
103
|
+
: dropExpiredWindows(withAccount(codex.value, accounts.codex), nowMs, CODEX_WINDOW_KEYS);
|
|
104
|
+
try {
|
|
105
|
+
writer.write({
|
|
106
|
+
type: "account_usage_response",
|
|
107
|
+
v,
|
|
108
|
+
id: message.id,
|
|
109
|
+
...(claudeValue !== null
|
|
110
|
+
? { claude: claudeValue }
|
|
111
|
+
: { claudeError: CLAUDE_ACCOUNT_USAGE_ERROR }),
|
|
112
|
+
...(codexValue !== null
|
|
113
|
+
? { codex: codexValue }
|
|
114
|
+
: { codexError: CODEX_ACCOUNT_USAGE_ERROR }),
|
|
115
|
+
...(host !== null ? { host } : {}),
|
|
116
|
+
fetchedAt: new Date(Math.min(claude.atMs, codex.atMs)).toISOString(),
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
// 書込失敗(チャネル断)は握り潰す。
|
|
121
|
+
}
|
|
122
|
+
},
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
/** Claude 側の「使用率 / リセット時刻」の対応表(枠ごとにペアで落とすため)。 */
|
|
126
|
+
export const CLAUDE_WINDOW_KEYS = [
|
|
127
|
+
["fiveHourPercent", "fiveHourResetsAt"],
|
|
128
|
+
["sevenDayPercent", "sevenDayResetsAt"],
|
|
129
|
+
["premiumPercent", "premiumResetsAt"],
|
|
130
|
+
];
|
|
131
|
+
/** Codex 側の「使用率 / リセット時刻」の対応表。 */
|
|
132
|
+
export const CODEX_WINDOW_KEYS = [
|
|
133
|
+
["fiveHourPercent", "fiveHourResetsAt"],
|
|
134
|
+
["weeklyPercent", "weeklyResetsAt"],
|
|
135
|
+
];
|
|
136
|
+
/** マスク済みアカウントを載せたコピーを返す(undefined なら素通し, 純ロジック)。 */
|
|
137
|
+
export function withAccount(usage, account) {
|
|
138
|
+
// Claude usage が「実際に成功した同じ token」の profile から account を持つ場合は、
|
|
139
|
+
// 別認証源になり得る `claude auth status` のフォールバック値で上書きしない。
|
|
140
|
+
const sameTokenResolved = usage[CLAUDE_ACCOUNT_FROM_USAGE_TOKEN] === true;
|
|
141
|
+
return account === undefined || usage.account !== undefined || sameTokenResolved
|
|
142
|
+
? usage
|
|
143
|
+
: { ...usage, account };
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* リセット済み(`resetsAt <= now`)の枠を落とす(純ロジック, TESTABLE)。
|
|
147
|
+
*
|
|
148
|
+
* リセット後の % は「次の枠の実績」ではなく**前の枠の残骸**で、そのまま出すと嘘になる。
|
|
149
|
+
* 使用率とリセット時刻はペアで落とす(片方だけ残すと表示が壊れる)。
|
|
150
|
+
* `resetsAt` が無い/読めない枠は落とさない — 判定不能なだけで、古いとは限らない。
|
|
151
|
+
* 枠が全部落ちても `plan` / `account` は残す(カードは出て、枠行が無いだけになる)。
|
|
152
|
+
*/
|
|
153
|
+
export function dropExpiredWindows(usage, nowMs, windows) {
|
|
154
|
+
const sameTokenResolved = usage[CLAUDE_ACCOUNT_FROM_USAGE_TOKEN] === true;
|
|
155
|
+
const result = { ...usage };
|
|
156
|
+
for (const [percentKey, resetsKey] of windows) {
|
|
157
|
+
const iso = result[resetsKey];
|
|
158
|
+
if (typeof iso !== "string")
|
|
159
|
+
continue;
|
|
160
|
+
const resetsAtMs = Date.parse(iso);
|
|
161
|
+
if (!Number.isFinite(resetsAtMs) || resetsAtMs > nowMs)
|
|
162
|
+
continue;
|
|
163
|
+
delete result[percentKey];
|
|
164
|
+
delete result[resetsKey];
|
|
165
|
+
}
|
|
166
|
+
if (sameTokenResolved) {
|
|
167
|
+
Object.defineProperty(result, CLAUDE_ACCOUNT_FROM_USAGE_TOKEN, { value: true });
|
|
168
|
+
}
|
|
169
|
+
return result;
|
|
170
|
+
}
|
|
171
|
+
/**
|
|
172
|
+
* `PlanUsage`(OAuth 使用量 API)を wire の `ClaudeAccountUsage` へ写す(純ロジック, TESTABLE)。
|
|
173
|
+
* 全枠が null(= 何も読めなかった)なら null を返し、呼び出し側で claudeError へ落とす。
|
|
174
|
+
*/
|
|
175
|
+
export function toClaudeAccountUsage(plan) {
|
|
176
|
+
if (plan === null)
|
|
177
|
+
return null;
|
|
178
|
+
const usage = {
|
|
179
|
+
...(plan.fiveHourUtilization !== null && { fiveHourPercent: plan.fiveHourUtilization }),
|
|
180
|
+
...(plan.fiveHourResetsAt !== null && { fiveHourResetsAt: plan.fiveHourResetsAt }),
|
|
181
|
+
...(plan.sevenDayUtilization !== null && { sevenDayPercent: plan.sevenDayUtilization }),
|
|
182
|
+
...(plan.sevenDayResetsAt !== null && { sevenDayResetsAt: plan.sevenDayResetsAt }),
|
|
183
|
+
// premium = 上位モデルの週次枠(PlanUsage の sevenDayFable*)。
|
|
184
|
+
...(plan.sevenDayFableUtilization !== null && { premiumPercent: plan.sevenDayFableUtilization }),
|
|
185
|
+
...(plan.sevenDayFableResetsAt !== null && { premiumResetsAt: plan.sevenDayFableResetsAt }),
|
|
186
|
+
// プランバッジ用の生値(credentials 由来。アクセストークンは決して載せない)。
|
|
187
|
+
...(plan.subscriptionType ? { plan: plan.subscriptionType } : {}),
|
|
188
|
+
...(plan.rateLimitTier ? { rateLimitTier: plan.rateLimitTier } : {}),
|
|
189
|
+
...(plan.account ? { account: plan.account } : {}),
|
|
190
|
+
};
|
|
191
|
+
// undefined は旧provider/fixture(auth status fallback可)、null は同tokenで解決不能
|
|
192
|
+
// (別認証源のアカウントを誤表示しないため fallback 不可)。
|
|
193
|
+
if (plan.account !== undefined) {
|
|
194
|
+
Object.defineProperty(usage, CLAUDE_ACCOUNT_FROM_USAGE_TOKEN, { value: true });
|
|
195
|
+
}
|
|
196
|
+
if (usage.fiveHourPercent === undefined &&
|
|
197
|
+
usage.sevenDayPercent === undefined &&
|
|
198
|
+
usage.premiumPercent === undefined) {
|
|
199
|
+
return null;
|
|
200
|
+
}
|
|
201
|
+
return usage;
|
|
202
|
+
}
|
|
203
|
+
//# sourceMappingURL=accountUsage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accountUsage.js","sourceRoot":"","sources":["../../../src/engine/handlers/accountUsage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
// engine/handlers/claudeModels.ts
|
|
2
|
+
// Claude モデル一覧: Anthropic Models API 由来のピッカー候補を返す。session 非依存
|
|
3
|
+
// (ドラフトの起動前選択でも使うため)。取得失敗はエラー応答のみ返し、フォールバック
|
|
4
|
+
// (キャッシュ表示)は iOS 側の責務とする。
|
|
5
|
+
import { writeError } from "../context.js";
|
|
6
|
+
export const claudeModelHandlers = {
|
|
7
|
+
claude_model_list_request: async (message, ctx) => {
|
|
8
|
+
const { writer, state } = ctx;
|
|
9
|
+
const v = state.negotiatedVersion;
|
|
10
|
+
try {
|
|
11
|
+
const models = await ctx.claudeModelList();
|
|
12
|
+
if (models === null || models.length === 0) {
|
|
13
|
+
writeError(writer, v, message.id, "claude_model_list_unavailable", "モデル一覧を取得できませんでした(OAuth トークン無効またはオフライン)。");
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
writer.write({ type: "claude_model_list_response", v, id: message.id, models });
|
|
17
|
+
}
|
|
18
|
+
catch (error) {
|
|
19
|
+
writeError(writer, v, message.id, "claude_model_list_failed", String(error));
|
|
20
|
+
}
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=claudeModels.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claudeModels.js","sourceRoot":"","sources":["../../../src/engine/handlers/claudeModels.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,8DAA8D;AAC9D,4CAA4C;AAC5C,0BAA0B;AAE1B,OAAO,EAAE,UAAU,EAAwB,MAAM,eAAe,CAAC;AAEjE,MAAM,CAAC,MAAM,mBAAmB,GAAoB;IAClD,yBAAyB,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;QAChD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QAC9B,MAAM,CAAC,GAAG,KAAK,CAAC,iBAAiB,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,eAAe,EAAE,CAAC;YAC3C,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3C,UAAU,CACR,MAAM,EACN,CAAC,EACD,OAAO,CAAC,EAAE,EACV,+BAA+B,EAC/B,yCAAyC,CAC1C,CAAC;gBACF,OAAO;YACT,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAClF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,0BAA0B,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
// engine/handlers/codex.ts
|
|
2
|
+
// Codex App Server 連携: モデル一覧・turn 開始(Hub 所有 turn への submit)・turn 中断。
|
|
3
|
+
import { writeError } from "../context.js";
|
|
4
|
+
export const codexHandlers = {
|
|
5
|
+
codex_model_list_request: async (message, ctx) => {
|
|
6
|
+
const { writer, state } = ctx;
|
|
7
|
+
const v = state.negotiatedVersion;
|
|
8
|
+
if (ctx.codexAppServer === null) {
|
|
9
|
+
writeError(writer, v, message.id, "codex_app_server_unavailable", "Codex App Server が未構成です。");
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
try {
|
|
13
|
+
const models = await ctx.codexAppServer.listModels();
|
|
14
|
+
writer.write({ type: "codex_model_list_response", v, id: message.id, models });
|
|
15
|
+
}
|
|
16
|
+
catch (error) {
|
|
17
|
+
writeError(writer, v, message.id, "codex_model_list_failed", String(error));
|
|
18
|
+
}
|
|
19
|
+
},
|
|
20
|
+
codex_turn_start: async (message, ctx) => {
|
|
21
|
+
const { writer, state, metadataStore } = ctx;
|
|
22
|
+
const v = state.negotiatedVersion;
|
|
23
|
+
const meta = metadataStore?.get(message.session) ?? null;
|
|
24
|
+
const providerSessionId = meta?.providerSessionId ?? null;
|
|
25
|
+
if (meta?.agent !== "codex" || providerSessionId === null) {
|
|
26
|
+
writeError(writer, v, message.id, "codex_thread_not_found", `Codex App Server thread がセッション '${message.session}' に束縛されていません。`);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
try {
|
|
30
|
+
try {
|
|
31
|
+
const result = await ctx.hubRpc({ type: "codex_turn_submit", id: message.id, session: message.session,
|
|
32
|
+
text: message.text, clientUserMessageId: message.clientUserMessageId ?? message.id,
|
|
33
|
+
effort: message.effort ?? null,
|
|
34
|
+
approvalPolicy: message.approvalPolicy ?? null,
|
|
35
|
+
sandbox: message.sandbox ?? null,
|
|
36
|
+
threadId: providerSessionId, cwd: meta.cwd,
|
|
37
|
+
...(message.explicitRetry === true ? { explicitRetry: true } : {}) }, message.id, ctx.codexHubRpcTimeoutMs);
|
|
38
|
+
writer.write({
|
|
39
|
+
type: "codex_turn_start_result",
|
|
40
|
+
v,
|
|
41
|
+
id: result.id,
|
|
42
|
+
status: result.status,
|
|
43
|
+
...(result.error !== undefined ? { error: result.error } : {}),
|
|
44
|
+
});
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
// timeout は「未開始」と「開始済みだが ACK 消失」を区別できない。local controller
|
|
49
|
+
// へ fail-open すると後者で二重 turn になるため、相関可能な failed を返して
|
|
50
|
+
// durable outbox の同一 clientUserMessageId 再送へ委ねる。
|
|
51
|
+
writer.write({
|
|
52
|
+
type: "codex_turn_start_result",
|
|
53
|
+
v,
|
|
54
|
+
id: message.id,
|
|
55
|
+
status: "failed",
|
|
56
|
+
error: String(error),
|
|
57
|
+
});
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
writer.write({
|
|
63
|
+
type: "codex_turn_start_result",
|
|
64
|
+
v,
|
|
65
|
+
id: message.id,
|
|
66
|
+
status: "failed",
|
|
67
|
+
error: String(error),
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
},
|
|
71
|
+
codex_turn_interrupt: async (message, ctx) => {
|
|
72
|
+
const { writer, state, metadataStore } = ctx;
|
|
73
|
+
const v = state.negotiatedVersion;
|
|
74
|
+
const meta = metadataStore?.get(message.session) ?? null;
|
|
75
|
+
const providerSessionId = meta?.providerSessionId ?? null;
|
|
76
|
+
if (meta?.agent !== "codex" || providerSessionId === null) {
|
|
77
|
+
writeError(writer, v, message.id, "codex_thread_not_found", `Codex App Server thread がセッション '${message.session}' に束縛されていません。`);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
// hub 所有 turn への fire-and-forget 中断。切断中は hubClient が破棄する。
|
|
81
|
+
// 中断を再接続後まで queue すると、その時点の別 turn を誤って止めるため遅延配送しない。
|
|
82
|
+
ctx.hubLink.send({
|
|
83
|
+
type: "codex_turn_interrupt",
|
|
84
|
+
id: message.id,
|
|
85
|
+
session: message.session,
|
|
86
|
+
});
|
|
87
|
+
// 埋め込み Hub / 旧構成との互換用に、注入されたローカル controller にも試みる。
|
|
88
|
+
// 現行の hub 所有構成では turn 未所有なので no-op。
|
|
89
|
+
try {
|
|
90
|
+
await ctx.codexTurnController?.interruptTurn?.(message.session);
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
writeError(writer, v, message.id, "codex_turn_interrupt_failed", String(error));
|
|
94
|
+
}
|
|
95
|
+
},
|
|
96
|
+
};
|
|
97
|
+
//# sourceMappingURL=codex.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/engine/handlers/codex.ts"],"names":[],"mappings":"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"}
|