From 2715d1a87875f0ddc358c3f08c1b70ca760b22ad Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Mon, 10 Aug 2026 20:27:56 -0700 Subject: [PATCH] refactor(agents): unify dot-family attempt helper names (#121550) * refactor(agents): add dash-named attempt helpers * refactor(agents): repoint dot-family attempt imports * refactor(agents): remove dot-family attempt helpers --- config/max-lines-baseline.txt | 2 +- src/agents/cli-runner/prepare.ts | 12 ++++++------ .../prepared-compaction-runtime.ts | 2 +- src/agents/embedded-agent-runner/run-loop.ts | 2 +- ...mpt.async-tasks.ts => attempt-async-tasks.ts} | 0 .../run/attempt-bootstrap-prepare.ts | 2 +- ...pers.ts => attempt-context-engine-helpers.ts} | 0 .../run/attempt-execution-settle.test.ts | 2 +- .../run/attempt-finalize.ts | 12 ++++++------ .../embedded-agent-runner/run/attempt-history.ts | 12 ++++++------ ...t.llm-boundary.ts => attempt-llm-boundary.ts} | 0 .../run/attempt-phase-lifecycle.test.ts | 2 +- .../run/attempt-prompt-build.ts | 10 +++++----- .../run/attempt-prompt-error.test.ts | 2 +- ...ompt-helpers.ts => attempt-prompt-helpers.ts} | 0 .../run/attempt-prompt-preflight.ts | 4 ++-- .../run/attempt-prompt-submit.ts | 4 ++-- ...queue-message.ts => attempt-queue-message.ts} | 0 .../embedded-agent-runner/run/attempt-result.ts | 2 +- ...run-decisions.ts => attempt-run-decisions.ts} | 0 .../run/attempt-session-cleanup.test.ts | 2 +- .../run/attempt-session-prepare.ts | 14 +++++++------- .../run/attempt-session-settle.ts | 2 +- ...ssions-yield.ts => attempt-sessions-yield.ts} | 0 .../embedded-agent-runner/run/attempt-setup.ts | 10 +++++----- ...s => attempt-spawn-workspace.test-support.ts} | 0 ...covery.ts => attempt-stop-reason-recovery.ts} | 0 .../run/attempt-stream-prepare.test.ts | 4 ++-- .../run/attempt-stream-prepare.ts | 8 ++++---- .../run/attempt-stream-settle.ts | 16 ++++++++-------- .../embedded-agent-runner/run/attempt-stream.ts | 8 ++++---- ...leanup.ts => attempt-subscription-cleanup.ts} | 0 .../run/attempt-system-prompt-prepare.ts | 4 ++-- ...read-helpers.ts => attempt-thread-helpers.ts} | 0 ...k-type.ts => attempt-tool-call-block-type.ts} | 0 .../run/attempt-tool-catalog.ts | 2 +- .../run/attempt-tool-prepare.ts | 8 ++++---- ...un-context.ts => attempt-tool-run-context.ts} | 0 ...n-plan.ts => attempt-tool-search-run-plan.ts} | 0 ... attempt-user-transcript-context-registry.ts} | 0 .../run/attempt.abort-race.test.ts | 2 +- .../run/attempt.async-tasks.test.ts | 2 +- .../run/attempt.context-engine-helpers.test.ts | 2 +- .../run/attempt.cwd-split.test.ts | 2 +- .../attempt.llm-boundary.cache-stability.test.ts | 2 +- .../run/attempt.llm-boundary.test.ts | 2 +- .../attempt.media-hint-cache-boundary.test.ts | 4 ++-- .../run/attempt.memory-flush-forwarding.test.ts | 2 +- .../run/attempt.prompt-helpers.test.ts | 4 ++-- .../run/attempt.queue-message.test.ts | 2 +- .../run/attempt.sessions-yield.test.ts | 2 +- ...empt.spawn-workspace.bootstrap-marker.test.ts | 2 +- ...mpt.spawn-workspace.bootstrap-warning.test.ts | 2 +- .../attempt.spawn-workspace.cache-ttl.test.ts | 2 +- ...ttempt.spawn-workspace.context-engine.test.ts | 6 +++--- ...mpt.spawn-workspace.context-injection.test.ts | 4 ++-- .../attempt.spawn-workspace.diagnostics.test.ts | 2 +- ...ttempt.spawn-workspace.sessions-spawn.test.ts | 2 +- .../run/attempt.stop-reason-recovery.test.ts | 2 +- .../run/attempt.subscription-cleanup.test.ts | 2 +- .../embedded-agent-runner/run/attempt.test.ts | 8 ++++---- .../run/attempt.tool-call-argument-repair.ts | 2 +- .../run/attempt.tool-call-normalization.ts | 2 +- .../attempt.tool-search-catalog-abort.test.ts | 2 +- .../run/attempt.tool-search-run-plan.test.ts | 2 +- src/agents/embedded-agent-runner/run/attempt.ts | 8 ++++---- .../run/attempt.ultra-thinking.test.ts | 2 +- ...empt.user-transcript-context-registry.test.ts | 2 +- .../run/message-merge-strategy.ts | 2 +- .../transcript-repair-runtime-contract.test.ts | 2 +- src/agents/harness/context-engine-lifecycle.ts | 2 +- .../agent-session-loop-correctness.test.ts | 2 +- .../agent-session-loop-next-turn.test.ts | 2 +- src/agents/tools/ask-user-tool.test.ts | 2 +- src/plugin-sdk/agent-harness-runtime.ts | 6 +++--- 75 files changed, 122 insertions(+), 122 deletions(-) rename src/agents/embedded-agent-runner/run/{attempt.async-tasks.ts => attempt-async-tasks.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.context-engine-helpers.ts => attempt-context-engine-helpers.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.llm-boundary.ts => attempt-llm-boundary.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.prompt-helpers.ts => attempt-prompt-helpers.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.queue-message.ts => attempt-queue-message.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.run-decisions.ts => attempt-run-decisions.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.sessions-yield.ts => attempt-sessions-yield.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.spawn-workspace.test-support.ts => attempt-spawn-workspace.test-support.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.stop-reason-recovery.ts => attempt-stop-reason-recovery.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.subscription-cleanup.ts => attempt-subscription-cleanup.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.thread-helpers.ts => attempt-thread-helpers.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.tool-call-block-type.ts => attempt-tool-call-block-type.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.tool-run-context.ts => attempt-tool-run-context.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.tool-search-run-plan.ts => attempt-tool-search-run-plan.ts} (100%) rename src/agents/embedded-agent-runner/run/{attempt.user-transcript-context-registry.ts => attempt-user-transcript-context-registry.ts} (100%) diff --git a/config/max-lines-baseline.txt b/config/max-lines-baseline.txt index 7cfa518e7199..25969bb22d27 100644 --- a/config/max-lines-baseline.txt +++ b/config/max-lines-baseline.txt @@ -381,7 +381,7 @@ src/agents/embedded-agent-runner/run.overflow-compaction.harness.ts src/agents/embedded-agent-runner/run/attempt.model-diagnostic-events.test.ts src/agents/embedded-agent-runner/run/attempt.model-diagnostic-events.ts src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-engine.test.ts -src/agents/embedded-agent-runner/run/attempt.spawn-workspace.test-support.ts +src/agents/embedded-agent-runner/run/attempt-spawn-workspace.test-support.ts src/agents/embedded-agent-runner/run/attempt.test.ts src/agents/embedded-agent-runner/run/attempt.tool-call-argument-repair.ts src/agents/embedded-agent-runner/run/attempt.tool-call-normalization.test.ts diff --git a/src/agents/cli-runner/prepare.ts b/src/agents/cli-runner/prepare.ts index ffee2f228ea0..112d31d366d4 100644 --- a/src/agents/cli-runner/prepare.ts +++ b/src/agents/cli-runner/prepare.ts @@ -88,16 +88,16 @@ import { import { resolveContextWindowInfo } from "../context-window-guard.js"; import { resolveContextTokensForModel } from "../context.js"; import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js"; +import { resolvePromptBuildHookResult } from "../embedded-agent-runner/run/attempt-prompt-helpers.js"; +import { + prependSystemPromptAddition, + resolveAttemptMediaTaskSystemPromptAddition, +} from "../embedded-agent-runner/run/attempt-prompt-helpers.js"; +import { composeSystemPromptWithHookContext } from "../embedded-agent-runner/run/attempt-thread-helpers.js"; import { applyEmbeddedAttemptToolsAllow, mergeForcedEmbeddedAttemptToolsAllow, } from "../embedded-agent-runner/run/attempt-tool-construction-plan.js"; -import { resolvePromptBuildHookResult } from "../embedded-agent-runner/run/attempt.prompt-helpers.js"; -import { - prependSystemPromptAddition, - resolveAttemptMediaTaskSystemPromptAddition, -} from "../embedded-agent-runner/run/attempt.prompt-helpers.js"; -import { composeSystemPromptWithHookContext } from "../embedded-agent-runner/run/attempt.thread-helpers.js"; import { buildCurrentInboundPrompt } from "../embedded-agent-runner/run/runtime-context-prompt.js"; import { mapSandboxSkillEntriesForPrompt, diff --git a/src/agents/embedded-agent-runner/prepared-compaction-runtime.ts b/src/agents/embedded-agent-runner/prepared-compaction-runtime.ts index 53315a603caf..2ace8cf863dd 100644 --- a/src/agents/embedded-agent-runner/prepared-compaction-runtime.ts +++ b/src/agents/embedded-agent-runner/prepared-compaction-runtime.ts @@ -66,7 +66,7 @@ import type { DirectCompactionPreparation } from "./direct-compaction-preparatio import { applyFinalEffectiveToolPolicy } from "./effective-tool-policy.js"; import { log } from "./logger.js"; import { buildEmbeddedMessageActionDiscoveryInput } from "./message-action-discovery-input.js"; -import { resolveAttemptSpawnWorkspaceDir } from "./run/attempt.thread-helpers.js"; +import { resolveAttemptSpawnWorkspaceDir } from "./run/attempt-thread-helpers.js"; import { buildEmbeddedSandboxInfo, resolveEmbeddedSandboxInfoExecPolicy } from "./sandbox-info.js"; import { mapSandboxSkillEntriesForPrompt, diff --git a/src/agents/embedded-agent-runner/run-loop.ts b/src/agents/embedded-agent-runner/run-loop.ts index ce1b4bca3145..8c2ffa9a933a 100644 --- a/src/agents/embedded-agent-runner/run-loop.ts +++ b/src/agents/embedded-agent-runner/run-loop.ts @@ -31,8 +31,8 @@ import { createEmbeddedRunReplayState } from "./replay-state.js"; import { handleEmbeddedAssistantFailure } from "./run/assistant-failure.js"; import { prepareAndDispatchEmbeddedRunAttempt } from "./run/attempt-dispatch-preparation.js"; import { normalizeEmbeddedRunAttempt } from "./run/attempt-normalization.js"; +import { forgetPromptBuildDrainCacheForRun } from "./run/attempt-prompt-helpers.js"; import { recoverEmbeddedRunAttempt } from "./run/attempt-recovery.js"; -import { forgetPromptBuildDrainCacheForRun } from "./run/attempt.prompt-helpers.js"; import { hasCodexAppServerRecoveryRetryBudget } from "./run/codex-app-server-recovery.js"; import { createEmbeddedRunCompactionRuntime } from "./run/compaction-runtime.js"; import { createEmbeddedRunContextRecoveryState } from "./run/context-recovery-state.js"; diff --git a/src/agents/embedded-agent-runner/run/attempt.async-tasks.ts b/src/agents/embedded-agent-runner/run/attempt-async-tasks.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.async-tasks.ts rename to src/agents/embedded-agent-runner/run/attempt-async-tasks.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-bootstrap-prepare.ts b/src/agents/embedded-agent-runner/run/attempt-bootstrap-prepare.ts index 4e71c7567888..106b08cffd1d 100644 --- a/src/agents/embedded-agent-runner/run/attempt-bootstrap-prepare.ts +++ b/src/agents/embedded-agent-runner/run/attempt-bootstrap-prepare.ts @@ -18,8 +18,8 @@ import { type WorkspaceBootstrapFile, } from "../../workspace.js"; import { log } from "../logger.js"; +import { resolveAttemptBootstrapContext } from "./attempt-context-engine-helpers.js"; import { remapInjectedContextFilesToWorkspace } from "./attempt-setup.js"; -import { resolveAttemptBootstrapContext } from "./attempt.context-engine-helpers.js"; import type { EmbeddedRunAttemptParams } from "./types.js"; export async function prepareEmbeddedAttemptBootstrap(params: { diff --git a/src/agents/embedded-agent-runner/run/attempt.context-engine-helpers.ts b/src/agents/embedded-agent-runner/run/attempt-context-engine-helpers.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.context-engine-helpers.ts rename to src/agents/embedded-agent-runner/run/attempt-context-engine-helpers.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-execution-settle.test.ts b/src/agents/embedded-agent-runner/run/attempt-execution-settle.test.ts index 05b0468f9e98..9054b09b0ed1 100644 --- a/src/agents/embedded-agent-runner/run/attempt-execution-settle.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt-execution-settle.test.ts @@ -27,8 +27,8 @@ vi.mock("./attempt-stream-finalize.js", () => ({ finalizeEmbeddedAttemptStreamPhase: mocks.finalizeStream, })); +import { SESSIONS_YIELD_ABORT_REASON } from "./attempt-sessions-yield.js"; import { runEmbeddedAttemptSettledPhase } from "./attempt-settle.js"; -import { SESSIONS_YIELD_ABORT_REASON } from "./attempt.sessions-yield.js"; type SettledInput = Parameters[0]; diff --git a/src/agents/embedded-agent-runner/run/attempt-finalize.ts b/src/agents/embedded-agent-runner/run/attempt-finalize.ts index 38a7b3c61766..6f1466d8c128 100644 --- a/src/agents/embedded-agent-runner/run/attempt-finalize.ts +++ b/src/agents/embedded-agent-runner/run/attempt-finalize.ts @@ -28,16 +28,16 @@ import { runContextEngineMaintenance } from "../context-engine-maintenance.js"; import { log } from "../logger.js"; import { markActiveEmbeddedRunAbandoned, type EmbeddedAgentQueueHandle } from "../runs.js"; import { buildEmbeddedAgentEndContext } from "./agent-end-context.js"; +import { + finalizeAttemptContextEngineTurn, + type buildContextEnginePromptCacheInfo, +} from "./attempt-context-engine-helpers.js"; +import { buildAfterTurnRuntimeContextFromUsage } from "./attempt-prompt-helpers.js"; +import { shouldPersistCompletedBootstrapTurn } from "./attempt-thread-helpers.js"; import { resolveAttemptTrajectoryTerminal, resolveTerminalAssistantTexts, } from "./attempt-trajectory-status.js"; -import { - finalizeAttemptContextEngineTurn, - type buildContextEnginePromptCacheInfo, -} from "./attempt.context-engine-helpers.js"; -import { buildAfterTurnRuntimeContextFromUsage } from "./attempt.prompt-helpers.js"; -import { shouldPersistCompletedBootstrapTurn } from "./attempt.thread-helpers.js"; import { shouldFlagCompactionTimeout } from "./compaction-timeout.js"; import { resolveFinalAssistantVisibleText } from "./helpers.js"; import { diff --git a/src/agents/embedded-agent-runner/run/attempt-history.ts b/src/agents/embedded-agent-runner/run/attempt-history.ts index ccfe88f43bb9..87eb9ce06e11 100644 --- a/src/agents/embedded-agent-runner/run/attempt-history.ts +++ b/src/agents/embedded-agent-runner/run/attempt-history.ts @@ -32,17 +32,17 @@ import { resolveTranscriptPolicy, type TranscriptPolicy } from "../../transcript import { getHistoryLimitFromSessionKey, limitHistoryTurns } from "../history.js"; import { log } from "../logger.js"; import { sanitizeSessionHistory, validateReplayTurns } from "../replay-history.js"; +import { + assembleAttemptContextEngine, + type AttemptContextEngine, +} from "./attempt-context-engine-helpers.js"; import type { resolveOrphanRepairPlan } from "./attempt-orphan-repair.js"; +import { prependSystemPromptAddition } from "./attempt-prompt-helpers.js"; +import { isRunnerToolCallBlockType } from "./attempt-tool-call-block-type.js"; import { loadAttemptSessionEntryAfterQuotaMaintenance, repairAttemptToolUseResultPairing, } from "./attempt-transcript-helpers.js"; -import { - assembleAttemptContextEngine, - type AttemptContextEngine, -} from "./attempt.context-engine-helpers.js"; -import { prependSystemPromptAddition } from "./attempt.prompt-helpers.js"; -import { isRunnerToolCallBlockType } from "./attempt.tool-call-block-type.js"; import { estimateRenderedLlmBoundaryTokenPressure } from "./preemptive-compaction.js"; import type { EmbeddedRunAttemptParams } from "./types.js"; diff --git a/src/agents/embedded-agent-runner/run/attempt.llm-boundary.ts b/src/agents/embedded-agent-runner/run/attempt-llm-boundary.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.llm-boundary.ts rename to src/agents/embedded-agent-runner/run/attempt-llm-boundary.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-phase-lifecycle.test.ts b/src/agents/embedded-agent-runner/run/attempt-phase-lifecycle.test.ts index 1ad9664c2a41..847688226eb5 100644 --- a/src/agents/embedded-agent-runner/run/attempt-phase-lifecycle.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt-phase-lifecycle.test.ts @@ -22,7 +22,7 @@ vi.mock("../../harness/agent-end-side-effects.js", () => ({ vi.mock("./agent-end-context.js", () => ({ buildEmbeddedAgentEndContext: () => ({}), })); -vi.mock("./attempt.async-tasks.js", () => ({ +vi.mock("./attempt-async-tasks.js", () => ({ shouldWaitForCompletionRequiredAsyncTasks: hoisted.shouldWaitForCompletionRequiredAsyncTasks, waitForCompletionRequiredAsyncTasks: hoisted.waitForCompletionRequiredAsyncTasks, })); diff --git a/src/agents/embedded-agent-runner/run/attempt-prompt-build.ts b/src/agents/embedded-agent-runner/run/attempt-prompt-build.ts index 000c0c299f1e..5383230a828e 100644 --- a/src/agents/embedded-agent-runner/run/attempt-prompt-build.ts +++ b/src/agents/embedded-agent-runner/run/attempt-prompt-build.ts @@ -51,19 +51,19 @@ import { toolResultWarningDedupe, truncateOversizedToolResultsInMessages, } from "../tool-result-truncation.js"; -import type { resolveOrphanRepairPlan } from "./attempt-orphan-repair.js"; -import { applyResolvedToolPromptFinalizer } from "./attempt-prompt-support.js"; import { normalizeCurrentPromptTextForLlmBoundary, normalizeMessagesForCurrentPromptBoundary, -} from "./attempt.llm-boundary.js"; +} from "./attempt-llm-boundary.js"; +import type { resolveOrphanRepairPlan } from "./attempt-orphan-repair.js"; import { prependSystemPromptAddition, resolveAttemptMediaTaskSystemPromptAddition, resolvePromptBuildHookResult, shouldWarnOnOrphanedUserRepair, -} from "./attempt.prompt-helpers.js"; -import { composeSystemPromptWithHookContext } from "./attempt.thread-helpers.js"; +} from "./attempt-prompt-helpers.js"; +import { applyResolvedToolPromptFinalizer } from "./attempt-prompt-support.js"; +import { composeSystemPromptWithHookContext } from "./attempt-thread-helpers.js"; import { pruneProcessedHistoryImages } from "./history-image-prune.js"; import { buildCurrentInboundPrompt, diff --git a/src/agents/embedded-agent-runner/run/attempt-prompt-error.test.ts b/src/agents/embedded-agent-runner/run/attempt-prompt-error.test.ts index 9a7ec4c43211..dd2a3569f9cd 100644 --- a/src/agents/embedded-agent-runner/run/attempt-prompt-error.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt-prompt-error.test.ts @@ -12,7 +12,7 @@ const hoisted = vi.hoisted(() => ({ withOwnedTranscriptWrite: vi.fn(async (operation: () => unknown) => await operation()), })); -vi.mock("./attempt.sessions-yield.js", () => ({ +vi.mock("./attempt-sessions-yield.js", () => ({ isSessionsYieldAbortError: hoisted.isSessionsYieldAbortError, persistSessionsYieldContextMessage: hoisted.persistSessionsYieldContextMessage, stripSessionsYieldArtifacts: hoisted.stripSessionsYieldArtifacts, diff --git a/src/agents/embedded-agent-runner/run/attempt.prompt-helpers.ts b/src/agents/embedded-agent-runner/run/attempt-prompt-helpers.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.prompt-helpers.ts rename to src/agents/embedded-agent-runner/run/attempt-prompt-helpers.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-prompt-preflight.ts b/src/agents/embedded-agent-runner/run/attempt-prompt-preflight.ts index 6349e528ecb0..879c5c383317 100644 --- a/src/agents/embedded-agent-runner/run/attempt-prompt-preflight.ts +++ b/src/agents/embedded-agent-runner/run/attempt-prompt-preflight.ts @@ -11,8 +11,8 @@ import { resolveLiveToolResultMaxChars, truncateOversizedToolResultsInSessionManager, } from "../tool-result-truncation.js"; -import type { AttemptContextEngine } from "./attempt.context-engine-helpers.js"; -import { normalizeMessagesForLlmBoundary } from "./attempt.llm-boundary.js"; +import type { AttemptContextEngine } from "./attempt-context-engine-helpers.js"; +import { normalizeMessagesForLlmBoundary } from "./attempt-llm-boundary.js"; import type { MidTurnPrecheckRequest } from "./midturn-precheck.js"; import { PREEMPTIVE_OVERFLOW_ERROR_TEXT, diff --git a/src/agents/embedded-agent-runner/run/attempt-prompt-submit.ts b/src/agents/embedded-agent-runner/run/attempt-prompt-submit.ts index 1c7b98b1b905..da379b547779 100644 --- a/src/agents/embedded-agent-runner/run/attempt-prompt-submit.ts +++ b/src/agents/embedded-agent-runner/run/attempt-prompt-submit.ts @@ -25,13 +25,13 @@ import { snapshotRecentMessages } from "./attempt-context-summary.js"; import { installModelPromptTransform, installRuntimeContextMessageForPrompt, -} from "./attempt.llm-boundary.js"; +} from "./attempt-llm-boundary.js"; import { isSessionsYieldAbortError, persistSessionsYieldContextMessage, stripSessionsYieldArtifacts, waitForSessionsYieldAbortSettle, -} from "./attempt.sessions-yield.js"; +} from "./attempt-sessions-yield.js"; import { detectAndLoadPromptImages } from "./images.js"; import { wrapStreamFnWithMessageTransform } from "./message-transform-stream-wrapper.js"; import { isMidTurnPrecheckSignal, type MidTurnPrecheckRequest } from "./midturn-precheck.js"; diff --git a/src/agents/embedded-agent-runner/run/attempt.queue-message.ts b/src/agents/embedded-agent-runner/run/attempt-queue-message.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.queue-message.ts rename to src/agents/embedded-agent-runner/run/attempt-queue-message.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-result.ts b/src/agents/embedded-agent-runner/run/attempt-result.ts index 23313be1c129..d623ae6a464b 100644 --- a/src/agents/embedded-agent-runner/run/attempt-result.ts +++ b/src/agents/embedded-agent-runner/run/attempt-result.ts @@ -16,7 +16,7 @@ import { log } from "../logger.js"; import type { PromptCacheBreak, PromptCacheChange } from "../prompt-cache-observability.js"; import { observeReplayMetadata, replayMetadataFromState } from "../replay-state.js"; import { finalizeEmbeddedAttempt } from "./attempt-finalize.js"; -import { shouldRunLlmOutputHooksForAttempt } from "./attempt.run-decisions.js"; +import { shouldRunLlmOutputHooksForAttempt } from "./attempt-run-decisions.js"; import { buildAttemptReplayMetadata, hasAttemptTerminalState, diff --git a/src/agents/embedded-agent-runner/run/attempt.run-decisions.ts b/src/agents/embedded-agent-runner/run/attempt-run-decisions.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.run-decisions.ts rename to src/agents/embedded-agent-runner/run/attempt-run-decisions.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-session-cleanup.test.ts b/src/agents/embedded-agent-runner/run/attempt-session-cleanup.test.ts index ceeaff8cba1b..4bb3b58cc0b1 100644 --- a/src/agents/embedded-agent-runner/run/attempt-session-cleanup.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt-session-cleanup.test.ts @@ -16,7 +16,7 @@ vi.mock("../logger.js", () => ({ vi.mock("./attempt-finalize.js", () => ({ flushEmbeddedAttemptTrajectoryRecorder: hoisted.flushEmbeddedAttemptTrajectoryRecorder, })); -vi.mock("./attempt.subscription-cleanup.js", () => ({ +vi.mock("./attempt-subscription-cleanup.js", () => ({ cleanupEmbeddedAttemptResources: hoisted.cleanupEmbeddedAttemptResources, })); diff --git a/src/agents/embedded-agent-runner/run/attempt-session-prepare.ts b/src/agents/embedded-agent-runner/run/attempt-session-prepare.ts index e50ac97763ea..370eb29b5e7e 100644 --- a/src/agents/embedded-agent-runner/run/attempt-session-prepare.ts +++ b/src/agents/embedded-agent-runner/run/attempt-session-prepare.ts @@ -32,20 +32,20 @@ import { log } from "../logger.js"; import { createEmbeddedAgentResourceLoader } from "../resource-loader.js"; import { applySystemPromptToSession } from "../system-prompt.js"; import { prepareEmbeddedAttemptClientTools } from "./attempt-client-tools.js"; +import { + type AttemptContextEngine, + runAttemptContextEngineBootstrap, +} from "./attempt-context-engine-helpers.js"; import { resolveAttemptTranscriptPolicy } from "./attempt-history.js"; +import { normalizeMessagesForLlmBoundary } from "./attempt-llm-boundary.js"; import { replayTrailingEntriesForOrphanRepair, resolveOrphanRepairPlan, } from "./attempt-orphan-repair.js"; +import { buildAfterTurnRuntimeContext } from "./attempt-prompt-helpers.js"; import { resolveExistingAttemptTranscriptState } from "./attempt-transcript-helpers.js"; import type { EmbeddedAttemptTranscriptLifecycle } from "./attempt-transcript-lifecycle.js"; -import { - type AttemptContextEngine, - runAttemptContextEngineBootstrap, -} from "./attempt.context-engine-helpers.js"; -import { normalizeMessagesForLlmBoundary } from "./attempt.llm-boundary.js"; -import { buildAfterTurnRuntimeContext } from "./attempt.prompt-helpers.js"; -import { createUserTranscriptContextRegistry } from "./attempt.user-transcript-context-registry.js"; +import { createUserTranscriptContextRegistry } from "./attempt-user-transcript-context-registry.js"; import { installCodeModeRepairHook } from "./code-mode-repair.js"; import { installMessageToolOnlyTerminalHook } from "./message-tool-terminal.js"; import { reconcilePrePersistedCurrentUserTurn } from "./pre-persisted-user-turn.js"; diff --git a/src/agents/embedded-agent-runner/run/attempt-session-settle.ts b/src/agents/embedded-agent-runner/run/attempt-session-settle.ts index c5ec8a70ef3c..0c0953d07aaa 100644 --- a/src/agents/embedded-agent-runner/run/attempt-session-settle.ts +++ b/src/agents/embedded-agent-runner/run/attempt-session-settle.ts @@ -11,8 +11,8 @@ import { log } from "../logger.js"; import { flushPendingToolResultsAfterIdle } from "../wait-for-idle-before-flush.js"; import { flushEmbeddedAttemptTrajectoryRecorder } from "./attempt-finalize.js"; import type { EmitDiagnosticRunCompleted } from "./attempt-setup.js"; +import { cleanupEmbeddedAttemptResources } from "./attempt-subscription-cleanup.js"; import type { createEmbeddedAttemptTranscriptLifecycle } from "./attempt-transcript-lifecycle.js"; -import { cleanupEmbeddedAttemptResources } from "./attempt.subscription-cleanup.js"; import type { EmbeddedRunAttemptParams } from "./types.js"; /** Tracks native prompt and abort settlement through attempt cleanup. */ diff --git a/src/agents/embedded-agent-runner/run/attempt.sessions-yield.ts b/src/agents/embedded-agent-runner/run/attempt-sessions-yield.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.sessions-yield.ts rename to src/agents/embedded-agent-runner/run/attempt-sessions-yield.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-setup.ts b/src/agents/embedded-agent-runner/run/attempt-setup.ts index b4fa736cc264..467e1098375b 100644 --- a/src/agents/embedded-agent-runner/run/attempt-setup.ts +++ b/src/agents/embedded-agent-runner/run/attempt-setup.ts @@ -63,7 +63,12 @@ import { resolveLiveToolResultMaxChars, } from "../tool-result-truncation.js"; import { mapThinkingLevel, mapThinkingLevelForProvider } from "../utils.js"; +import { buildLoopPromptCacheInfo } from "./attempt-context-engine-helpers.js"; import { configureEmbeddedAttemptHttpRuntime } from "./attempt-http-runtime.js"; +import { + buildAfterTurnRuntimeContext, + resolveAttemptFsWorkspaceOnly, +} from "./attempt-prompt-helpers.js"; import { createEmbeddedRunStageSummaryEmitter, createEmbeddedRunStageTracker, @@ -71,11 +76,6 @@ import { shouldWarnEmbeddedRunStageSummary, } from "./attempt-stage-timing.js"; import { repairAttemptToolUseResultPairing } from "./attempt-transcript-helpers.js"; -import { buildLoopPromptCacheInfo } from "./attempt.context-engine-helpers.js"; -import { - buildAfterTurnRuntimeContext, - resolveAttemptFsWorkspaceOnly, -} from "./attempt.prompt-helpers.js"; import { installHistoryImagePruneContextTransform } from "./history-image-prune.js"; import type { MidTurnPrecheckRequest } from "./midturn-precheck.js"; import type { EmbeddedRunAttemptParams, EmbeddedRunAttemptResult } from "./types.js"; diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.test-support.ts b/src/agents/embedded-agent-runner/run/attempt-spawn-workspace.test-support.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.spawn-workspace.test-support.ts rename to src/agents/embedded-agent-runner/run/attempt-spawn-workspace.test-support.ts diff --git a/src/agents/embedded-agent-runner/run/attempt.stop-reason-recovery.ts b/src/agents/embedded-agent-runner/run/attempt-stop-reason-recovery.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.stop-reason-recovery.ts rename to src/agents/embedded-agent-runner/run/attempt-stop-reason-recovery.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-stream-prepare.test.ts b/src/agents/embedded-agent-runner/run/attempt-stream-prepare.test.ts index b906240e2e56..1f13e0417069 100644 --- a/src/agents/embedded-agent-runner/run/attempt-stream-prepare.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt-stream-prepare.test.ts @@ -29,7 +29,7 @@ vi.mock("../runs.js", () => ({ clearActiveEmbeddedRun: mocks.clearActiveRun, setActiveEmbeddedRun: mocks.setActiveRun, })); -vi.mock("./attempt.subscription-cleanup.js", () => ({ +vi.mock("./attempt-subscription-cleanup.js", () => ({ buildEmbeddedSubscriptionParams: mocks.buildSubscriptionParams, })); vi.mock("./tool-activity-heartbeat.js", () => ({ @@ -43,8 +43,8 @@ import { createEmbeddedAttemptExternalAbortController, createEmbeddedAttemptRunAbort, } from "./attempt-finalize.js"; +import { SESSIONS_YIELD_ABORT_REASON } from "./attempt-sessions-yield.js"; import { prepareEmbeddedAttemptStream } from "./attempt-stream-prepare.js"; -import { SESSIONS_YIELD_ABORT_REASON } from "./attempt.sessions-yield.js"; function prepareCatalogExecutor( projections: ToolSearchTargetTranscriptProjection[], diff --git a/src/agents/embedded-agent-runner/run/attempt-stream-prepare.ts b/src/agents/embedded-agent-runner/run/attempt-stream-prepare.ts index 5ffa34cb09b6..c818e72daf61 100644 --- a/src/agents/embedded-agent-runner/run/attempt-stream-prepare.ts +++ b/src/agents/embedded-agent-runner/run/attempt-stream-prepare.ts @@ -39,13 +39,13 @@ import { type EmbeddedAgentQueueHandle, setActiveEmbeddedRun, } from "../runs.js"; -import type { EmbeddedAttemptClientToolCallSlot } from "./attempt-result.js"; import { requiresCompletionRequiredAsyncTaskWait, type AsyncStartedToolMeta, -} from "./attempt.async-tasks.js"; -import { steerActiveSessionWithOptionalDeliveryWait } from "./attempt.queue-message.js"; -import { buildEmbeddedSubscriptionParams } from "./attempt.subscription-cleanup.js"; +} from "./attempt-async-tasks.js"; +import { steerActiveSessionWithOptionalDeliveryWait } from "./attempt-queue-message.js"; +import type { EmbeddedAttemptClientToolCallSlot } from "./attempt-result.js"; +import { buildEmbeddedSubscriptionParams } from "./attempt-subscription-cleanup.js"; import { resolveFinalAssistantRawText, resolveFinalAssistantVisibleText, diff --git a/src/agents/embedded-agent-runner/run/attempt-stream-settle.ts b/src/agents/embedded-agent-runner/run/attempt-stream-settle.ts index f2ab86753801..09a5a393db9e 100644 --- a/src/agents/embedded-agent-runner/run/attempt-stream-settle.ts +++ b/src/agents/embedded-agent-runner/run/attempt-stream-settle.ts @@ -43,26 +43,26 @@ import { } from "../stream-resolution.js"; import type { ProviderThinkLevel } from "../utils.js"; import { joinWithRunLivenessDeadline, RUN_LIVENESS_JOIN_TIMEOUT_MS } from "./abortable.js"; -import { - flushSessionManagerTranscript, - normalizeCompactionRecoveryTranscriptTail, -} from "./attempt-transcript-helpers.js"; import { shouldWaitForCompletionRequiredAsyncTasks, waitForCompletionRequiredAsyncTasks, type CompletionRequiredAsyncTaskWaitResult, -} from "./attempt.async-tasks.js"; +} from "./attempt-async-tasks.js"; import { buildContextEnginePromptCacheInfo, findCurrentAttemptAssistantMessage, findLatestUncompactedAttemptUsageSnapshot, resolvePromptCacheTouchTimestamp, -} from "./attempt.context-engine-helpers.js"; +} from "./attempt-context-engine-helpers.js"; import { resolveAttemptStreamAuthProfileId, resolveAttemptToolPolicyMessageProvider, -} from "./attempt.run-decisions.js"; -import { appendAttemptCacheTtlIfNeeded } from "./attempt.thread-helpers.js"; +} from "./attempt-run-decisions.js"; +import { appendAttemptCacheTtlIfNeeded } from "./attempt-thread-helpers.js"; +import { + flushSessionManagerTranscript, + normalizeCompactionRecoveryTranscriptTail, +} from "./attempt-transcript-helpers.js"; import { hasActiveCompactionRetryWork, waitForCompactionRetryWithAggregateTimeout, diff --git a/src/agents/embedded-agent-runner/run/attempt-stream.ts b/src/agents/embedded-agent-runner/run/attempt-stream.ts index 61d78733cfc5..8c4310be1f51 100644 --- a/src/agents/embedded-agent-runner/run/attempt-stream.ts +++ b/src/agents/embedded-agent-runner/run/attempt-stream.ts @@ -20,13 +20,13 @@ import { dropThinkingBlocks, wrapAnthropicStreamWithRecovery, } from "../thinking.js"; -import { wrapStreamFnWithDiagnosticModelCallEvents } from "./attempt.model-diagnostic-events.js"; -import { resolveUnknownToolGuardThreshold } from "./attempt.run-decisions.js"; +import { resolveUnknownToolGuardThreshold } from "./attempt-run-decisions.js"; import { createYieldAbortedResponse, isSessionsYieldAbortReason, -} from "./attempt.sessions-yield.js"; -import { wrapStreamFnHandleSensitiveStopReason } from "./attempt.stop-reason-recovery.js"; +} from "./attempt-sessions-yield.js"; +import { wrapStreamFnHandleSensitiveStopReason } from "./attempt-stop-reason-recovery.js"; +import { wrapStreamFnWithDiagnosticModelCallEvents } from "./attempt.model-diagnostic-events.js"; import { shouldRepairMalformedToolCallArguments, wrapStreamFnDecodeXaiToolCallArguments, diff --git a/src/agents/embedded-agent-runner/run/attempt.subscription-cleanup.ts b/src/agents/embedded-agent-runner/run/attempt-subscription-cleanup.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.subscription-cleanup.ts rename to src/agents/embedded-agent-runner/run/attempt-subscription-cleanup.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-system-prompt-prepare.ts b/src/agents/embedded-agent-runner/run/attempt-system-prompt-prepare.ts index 5bbda0398561..32d5510ce2f3 100644 --- a/src/agents/embedded-agent-runner/run/attempt-system-prompt-prepare.ts +++ b/src/agents/embedded-agent-runner/run/attempt-system-prompt-prepare.ts @@ -44,11 +44,11 @@ import { buildEmbeddedMessageActionDiscoveryInput } from "../message-action-disc import { buildEmbeddedSandboxInfo, resolveEmbeddedSandboxInfoExecPolicy } from "../sandbox-info.js"; import { buildEmbeddedSystemPrompt } from "../system-prompt.js"; import type { prepareEmbeddedAttemptBootstrap } from "./attempt-bootstrap-prepare.js"; -import { buildAttemptSystemPrompt } from "./attempt-system-prompt.js"; import { resolvePromptModeForSession, shouldInjectHeartbeatPrompt, -} from "./attempt.prompt-helpers.js"; +} from "./attempt-prompt-helpers.js"; +import { buildAttemptSystemPrompt } from "./attempt-system-prompt.js"; import type { EmbeddedRunAttemptParams } from "./types.js"; type PreparedBootstrap = Awaited>; diff --git a/src/agents/embedded-agent-runner/run/attempt.thread-helpers.ts b/src/agents/embedded-agent-runner/run/attempt-thread-helpers.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.thread-helpers.ts rename to src/agents/embedded-agent-runner/run/attempt-thread-helpers.ts diff --git a/src/agents/embedded-agent-runner/run/attempt.tool-call-block-type.ts b/src/agents/embedded-agent-runner/run/attempt-tool-call-block-type.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.tool-call-block-type.ts rename to src/agents/embedded-agent-runner/run/attempt-tool-call-block-type.ts diff --git a/src/agents/embedded-agent-runner/run/attempt-tool-catalog.ts b/src/agents/embedded-agent-runner/run/attempt-tool-catalog.ts index 6ceed8b24f71..6325a5b4cac6 100644 --- a/src/agents/embedded-agent-runner/run/attempt-tool-catalog.ts +++ b/src/agents/embedded-agent-runner/run/attempt-tool-catalog.ts @@ -24,7 +24,7 @@ import { log } from "../logger.js"; import type { prepareEmbeddedAttemptBundleTools } from "./attempt-bundle-tools.js"; import { collectAttemptExplicitToolAllowlistSources } from "./attempt-tool-allowlist.js"; import type { prepareEmbeddedAttemptToolBase } from "./attempt-tool-prepare.js"; -import { buildToolSearchRunPlan } from "./attempt.tool-search-run-plan.js"; +import { buildToolSearchRunPlan } from "./attempt-tool-search-run-plan.js"; import { wrapEmbeddedAttemptToolWithActivity } from "./tool-activity-heartbeat.js"; import type { EmbeddedRunAttemptParams } from "./types.js"; diff --git a/src/agents/embedded-agent-runner/run/attempt-tool-prepare.ts b/src/agents/embedded-agent-runner/run/attempt-tool-prepare.ts index 954e2a6dcd94..ce502e9e1953 100644 --- a/src/agents/embedded-agent-runner/run/attempt-tool-prepare.ts +++ b/src/agents/embedded-agent-runner/run/attempt-tool-prepare.ts @@ -31,15 +31,15 @@ import type { CronToolsAllowCaptureRef, } from "../../tools/cron-tool.js"; import { log } from "../logger.js"; +import { resolveAttemptToolPolicyMessageProvider } from "./attempt-run-decisions.js"; +import { resolveAttemptSpawnWorkspaceDir } from "./attempt-thread-helpers.js"; import { applyEmbeddedAttemptToolsAllow, mergeForcedEmbeddedAttemptToolsAllow, resolveEmbeddedAttemptToolConstructionPlan, } from "./attempt-tool-construction-plan.js"; -import { resolveAttemptToolPolicyMessageProvider } from "./attempt.run-decisions.js"; -import { resolveAttemptSpawnWorkspaceDir } from "./attempt.thread-helpers.js"; -import { buildEmbeddedAttemptToolRunContext } from "./attempt.tool-run-context.js"; -import { TOOL_SEARCH_CONTROL_ALLOWLIST_NAMES } from "./attempt.tool-search-run-plan.js"; +import { buildEmbeddedAttemptToolRunContext } from "./attempt-tool-run-context.js"; +import { TOOL_SEARCH_CONTROL_ALLOWLIST_NAMES } from "./attempt-tool-search-run-plan.js"; import type { EmbeddedRunAttemptParams } from "./types.js"; type OpenClawCodingToolsOptions = NonNullable[0]>; diff --git a/src/agents/embedded-agent-runner/run/attempt.tool-run-context.ts b/src/agents/embedded-agent-runner/run/attempt-tool-run-context.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.tool-run-context.ts rename to src/agents/embedded-agent-runner/run/attempt-tool-run-context.ts diff --git a/src/agents/embedded-agent-runner/run/attempt.tool-search-run-plan.ts b/src/agents/embedded-agent-runner/run/attempt-tool-search-run-plan.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.tool-search-run-plan.ts rename to src/agents/embedded-agent-runner/run/attempt-tool-search-run-plan.ts diff --git a/src/agents/embedded-agent-runner/run/attempt.user-transcript-context-registry.ts b/src/agents/embedded-agent-runner/run/attempt-user-transcript-context-registry.ts similarity index 100% rename from src/agents/embedded-agent-runner/run/attempt.user-transcript-context-registry.ts rename to src/agents/embedded-agent-runner/run/attempt-user-transcript-context-registry.ts diff --git a/src/agents/embedded-agent-runner/run/attempt.abort-race.test.ts b/src/agents/embedded-agent-runner/run/attempt.abort-race.test.ts index 7f09fd1902c5..050aaea2759a 100644 --- a/src/agents/embedded-agent-runner/run/attempt.abort-race.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.abort-race.test.ts @@ -7,7 +7,7 @@ import { getHoisted, preloadRunEmbeddedAttemptForTests, resetEmbeddedAttemptHarness, -} from "./attempt.spawn-workspace.test-support.js"; +} from "./attempt-spawn-workspace.test-support.js"; const hoisted = getHoisted(); const tempPaths: string[] = []; diff --git a/src/agents/embedded-agent-runner/run/attempt.async-tasks.test.ts b/src/agents/embedded-agent-runner/run/attempt.async-tasks.test.ts index 92b58af09c8e..190089224692 100644 --- a/src/agents/embedded-agent-runner/run/attempt.async-tasks.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.async-tasks.test.ts @@ -11,7 +11,7 @@ import { shouldWaitForCompletionRequiredAsyncTasks, waitForCompletionRequiredAsyncTasks, type AsyncStartedToolMeta, -} from "./attempt.async-tasks.js"; +} from "./attempt-async-tasks.js"; function requireCreatedTask(task: TaskRecord | null): TaskRecord { // Task registry creation returns null for invalid task shapes; tests require diff --git a/src/agents/embedded-agent-runner/run/attempt.context-engine-helpers.test.ts b/src/agents/embedded-agent-runner/run/attempt.context-engine-helpers.test.ts index 97519a0d8dde..3e8d263bfbd9 100644 --- a/src/agents/embedded-agent-runner/run/attempt.context-engine-helpers.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.context-engine-helpers.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; import type { AssistantMessage } from "../../../llm/types.js"; -import { findLatestUncompactedAttemptUsageSnapshot } from "./attempt.context-engine-helpers.js"; +import { findLatestUncompactedAttemptUsageSnapshot } from "./attempt-context-engine-helpers.js"; const ASSISTANT_WITH_USAGE = { role: "assistant", diff --git a/src/agents/embedded-agent-runner/run/attempt.cwd-split.test.ts b/src/agents/embedded-agent-runner/run/attempt.cwd-split.test.ts index 9f62c084d1c7..902961cf1ce9 100644 --- a/src/agents/embedded-agent-runner/run/attempt.cwd-split.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.cwd-split.test.ts @@ -10,7 +10,7 @@ import { getHoisted, preloadRunEmbeddedAttemptForTests, resetEmbeddedAttemptHarness, -} from "./attempt.spawn-workspace.test-support.js"; +} from "./attempt-spawn-workspace.test-support.js"; const hoisted = getHoisted(); const tempPaths: string[] = []; diff --git a/src/agents/embedded-agent-runner/run/attempt.llm-boundary.cache-stability.test.ts b/src/agents/embedded-agent-runner/run/attempt.llm-boundary.cache-stability.test.ts index 1f52b413daa7..ab95b35074e3 100644 --- a/src/agents/embedded-agent-runner/run/attempt.llm-boundary.cache-stability.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.llm-boundary.cache-stability.test.ts @@ -38,7 +38,7 @@ import { OPENCLAW_RUNTIME_CONTEXT_CUSTOM_TYPE, relocateCurrentRuntimeContextCarrierToTail, } from "../../internal-runtime-context.js"; -import { normalizeMessagesForLlmBoundary } from "./attempt.llm-boundary.js"; +import { normalizeMessagesForLlmBoundary } from "./attempt-llm-boundary.js"; // --------------------------------------------------------------------------- // Helpers diff --git a/src/agents/embedded-agent-runner/run/attempt.llm-boundary.test.ts b/src/agents/embedded-agent-runner/run/attempt.llm-boundary.test.ts index efcafdb4422b..bab306aabff5 100644 --- a/src/agents/embedded-agent-runner/run/attempt.llm-boundary.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.llm-boundary.test.ts @@ -10,7 +10,7 @@ import { installModelPromptTransform, normalizeCurrentPromptTextForLlmBoundary, normalizeMessagesForLlmBoundary, -} from "./attempt.llm-boundary.js"; +} from "./attempt-llm-boundary.js"; import { buildRuntimeContextCustomMessage } from "./runtime-context-prompt.js"; describe("normalizeMessagesForLlmBoundary", () => { diff --git a/src/agents/embedded-agent-runner/run/attempt.media-hint-cache-boundary.test.ts b/src/agents/embedded-agent-runner/run/attempt.media-hint-cache-boundary.test.ts index 669b2d3c8649..6586fd33369c 100644 --- a/src/agents/embedded-agent-runner/run/attempt.media-hint-cache-boundary.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.media-hint-cache-boundary.test.ts @@ -45,8 +45,8 @@ import { import { prependSystemPromptAddition, resolveAttemptMediaTaskSystemPromptAddition, -} from "./attempt.prompt-helpers.js"; -import { composeSystemPromptWithHookContext } from "./attempt.thread-helpers.js"; +} from "./attempt-prompt-helpers.js"; +import { composeSystemPromptWithHookContext } from "./attempt-thread-helpers.js"; const MEDIA_HINT = "Active image generation task in progress"; const HOOK = "Static plugin guidance"; // documented static-cacheable hook field, constant per turn diff --git a/src/agents/embedded-agent-runner/run/attempt.memory-flush-forwarding.test.ts b/src/agents/embedded-agent-runner/run/attempt.memory-flush-forwarding.test.ts index 61ff1489f469..2464e5ed76dc 100644 --- a/src/agents/embedded-agent-runner/run/attempt.memory-flush-forwarding.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.memory-flush-forwarding.test.ts @@ -6,7 +6,7 @@ import type { AuthStorage, ModelRegistry } from "openclaw/plugin-sdk/agent-sessi import type { Model } from "openclaw/plugin-sdk/llm"; import { describe, expect, it, vi } from "vitest"; import type { AnyAgentTool } from "../../agent-tools.types.js"; -import { buildEmbeddedAttemptToolRunContext } from "./attempt.tool-run-context.js"; +import { buildEmbeddedAttemptToolRunContext } from "./attempt-tool-run-context.js"; const MEMORY_RELATIVE_PATH = "memory/2026-03-24.md"; diff --git a/src/agents/embedded-agent-runner/run/attempt.prompt-helpers.test.ts b/src/agents/embedded-agent-runner/run/attempt.prompt-helpers.test.ts index 580a36c265cd..075df8c6a6ec 100644 --- a/src/agents/embedded-agent-runner/run/attempt.prompt-helpers.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.prompt-helpers.test.ts @@ -38,14 +38,14 @@ vi.mock("../../media-generation-task-status.js", () => ({ })); vi.mock("../../../plugins/host-hook-state.js", () => hostHookStateMocks); -import { resolvePromptSubmissionSkipReason } from "./attempt-prompt-submit.js"; import { forgetPromptBuildDrainCacheForRun, mergeOrphanedTrailingUserPrompt, resolveAttemptMediaTaskSystemPromptAddition, resolvePromptBuildHookResult, shouldInjectHeartbeatPrompt, -} from "./attempt.prompt-helpers.js"; +} from "./attempt-prompt-helpers.js"; +import { resolvePromptSubmissionSkipReason } from "./attempt-prompt-submit.js"; function hasLoneSurrogate(value: string): boolean { for (let index = 0; index < value.length; index += 1) { diff --git a/src/agents/embedded-agent-runner/run/attempt.queue-message.test.ts b/src/agents/embedded-agent-runner/run/attempt.queue-message.test.ts index 146ec687e987..1fb955bdda4b 100644 --- a/src/agents/embedded-agent-runner/run/attempt.queue-message.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.queue-message.test.ts @@ -6,7 +6,7 @@ import { reportSteeringMessagePersistenceFailure, setSteeringMessageIdentity, } from "../../sessions/steering-message-identity.js"; -import { steerActiveSessionWithOptionalDeliveryWait } from "./attempt.queue-message.js"; +import { steerActiveSessionWithOptionalDeliveryWait } from "./attempt-queue-message.js"; type EmbeddedAgentActiveSessionSteerTarget = Parameters< typeof steerActiveSessionWithOptionalDeliveryWait diff --git a/src/agents/embedded-agent-runner/run/attempt.sessions-yield.test.ts b/src/agents/embedded-agent-runner/run/attempt.sessions-yield.test.ts index e5df4fbc1121..7d7463620a10 100644 --- a/src/agents/embedded-agent-runner/run/attempt.sessions-yield.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.sessions-yield.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest"; import type { AssistantMessage, ToolResultMessage, UserMessage } from "../../../llm/types.js"; import type { AgentMessage } from "../../runtime/index.js"; import { SessionManager } from "../../sessions/session-manager.js"; -import { stripSessionsYieldArtifacts } from "./attempt.sessions-yield.js"; +import { stripSessionsYieldArtifacts } from "./attempt-sessions-yield.js"; const SESSIONS_YIELD_INTERRUPT_CUSTOM_TYPE = "openclaw.sessions_yield_interrupt"; diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.bootstrap-marker.test.ts b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.bootstrap-marker.test.ts index 6fb290fed6c0..f90510ab5a20 100644 --- a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.bootstrap-marker.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.bootstrap-marker.test.ts @@ -1,6 +1,6 @@ // Coverage for deciding when bootstrap completion markers are persisted. import { describe, expect, it } from "vitest"; -import { shouldPersistCompletedBootstrapTurn } from "./attempt.thread-helpers.js"; +import { shouldPersistCompletedBootstrapTurn } from "./attempt-thread-helpers.js"; describe("runEmbeddedAttempt bootstrap completion marker", () => { it("keeps marker persistence enabled for clean sessions_yield exits", () => { diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.bootstrap-warning.test.ts b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.bootstrap-warning.test.ts index dc1da04fe8de..dc630724c078 100644 --- a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.bootstrap-warning.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.bootstrap-warning.test.ts @@ -6,7 +6,7 @@ import { buildBootstrapPromptWarningNotice, buildBootstrapInjectionStats, } from "../../bootstrap-budget.js"; -import { composeSystemPromptWithHookContext } from "./attempt.thread-helpers.js"; +import { composeSystemPromptWithHookContext } from "./attempt-thread-helpers.js"; describe("runEmbeddedAttempt bootstrap warning prompt assembly", () => { it("keeps bootstrap warnings in system context without raw diagnostics", () => { diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.cache-ttl.test.ts b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.cache-ttl.test.ts index b018aab11d87..c95432538821 100644 --- a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.cache-ttl.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.cache-ttl.test.ts @@ -1,6 +1,6 @@ // Coverage for cache-TTL session entries after embedded attempts. import { describe, expect, it, vi } from "vitest"; -import { appendAttemptCacheTtlIfNeeded } from "./attempt.thread-helpers.js"; +import { appendAttemptCacheTtlIfNeeded } from "./attempt-thread-helpers.js"; const ATTEMPT_CACHE_TTL_CUSTOM_TYPE = "openclaw.cache-ttl"; diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-engine.test.ts b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-engine.test.ts index c8f66b7386ce..1f4fb6aa356a 100644 --- a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-engine.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-engine.test.ts @@ -27,7 +27,7 @@ import { finalizeAttemptContextEngineTurn, resolvePromptCacheTouchTimestamp, runAttemptContextEngineBootstrap, -} from "./attempt.context-engine-helpers.js"; +} from "./attempt-context-engine-helpers.js"; import { cleanupTempPaths, createDefaultEmbeddedSession, @@ -37,11 +37,11 @@ import { getHoisted, preloadRunEmbeddedAttemptForTests, resetEmbeddedAttemptHarness, -} from "./attempt.spawn-workspace.test-support.js"; +} from "./attempt-spawn-workspace.test-support.js"; import { buildEmbeddedSubscriptionParams, cleanupEmbeddedAttemptResources, -} from "./attempt.subscription-cleanup.js"; +} from "./attempt-subscription-cleanup.js"; import type { MidTurnPrecheckRequest } from "./midturn-precheck.js"; const hoisted = getHoisted(); diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-injection.test.ts b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-injection.test.ts index 9a17d71b9667..a7b58fbd450c 100644 --- a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-injection.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.context-injection.test.ts @@ -10,8 +10,8 @@ import { assembleAttemptContextEngine, type AttemptContextEngine, resolveAttemptBootstrapContext, -} from "./attempt.context-engine-helpers.js"; -import { resetEmbeddedAttemptHarness } from "./attempt.spawn-workspace.test-support.js"; +} from "./attempt-context-engine-helpers.js"; +import { resetEmbeddedAttemptHarness } from "./attempt-spawn-workspace.test-support.js"; async function resolveBootstrapContext(params: { contextInjectionMode?: "always" | "continuation-skip" | "never"; diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.diagnostics.test.ts b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.diagnostics.test.ts index b63b77467d82..8f798cff4ea3 100644 --- a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.diagnostics.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.diagnostics.test.ts @@ -13,7 +13,7 @@ import { createContextEngineBootstrapAndAssemble, preloadRunEmbeddedAttemptForTests, resetEmbeddedAttemptHarness, -} from "./attempt.spawn-workspace.test-support.js"; +} from "./attempt-spawn-workspace.test-support.js"; describe("runEmbeddedAttempt diagnostics", () => { const tempPaths: string[] = []; diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.sessions-spawn.test.ts b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.sessions-spawn.test.ts index 638e184cbd82..31874c7a7e58 100644 --- a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.sessions-spawn.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.sessions-spawn.test.ts @@ -1,7 +1,7 @@ // Coverage for sessions_spawn workspace inheritance from sandbox context. import { describe, expect, it } from "vitest"; import { createAgentToolsSandboxContext } from "../../test-helpers/agent-tools-sandbox-context.js"; -import { resolveAttemptSpawnWorkspaceDir } from "./attempt.thread-helpers.js"; +import { resolveAttemptSpawnWorkspaceDir } from "./attempt-thread-helpers.js"; describe("runEmbeddedAttempt sessions_spawn workspace inheritance", () => { it("passes the real workspace to sessions_spawn when workspaceAccess is ro", () => { diff --git a/src/agents/embedded-agent-runner/run/attempt.stop-reason-recovery.test.ts b/src/agents/embedded-agent-runner/run/attempt.stop-reason-recovery.test.ts index 3dffe50e73df..67a4a6c3cd05 100644 --- a/src/agents/embedded-agent-runner/run/attempt.stop-reason-recovery.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.stop-reason-recovery.test.ts @@ -6,7 +6,7 @@ import { type Model, } from "openclaw/plugin-sdk/llm"; import { describe, expect, it } from "vitest"; -import { wrapStreamFnHandleSensitiveStopReason } from "./attempt.stop-reason-recovery.js"; +import { wrapStreamFnHandleSensitiveStopReason } from "./attempt-stop-reason-recovery.js"; const anthropicModel = { api: "anthropic-messages", diff --git a/src/agents/embedded-agent-runner/run/attempt.subscription-cleanup.test.ts b/src/agents/embedded-agent-runner/run/attempt.subscription-cleanup.test.ts index aad16b5ac96c..f481e66b66ef 100644 --- a/src/agents/embedded-agent-runner/run/attempt.subscription-cleanup.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.subscription-cleanup.test.ts @@ -3,7 +3,7 @@ import { afterEach, describe, expect, it, vi } from "vitest"; import { createDeferred } from "../../../../test/helpers/promise.js"; import { log } from "../logger.js"; import { resolveEmbeddedAbortSettleTimeoutMs } from "./attempt-finalize.js"; -import { cleanupEmbeddedAttemptResources } from "./attempt.subscription-cleanup.js"; +import { cleanupEmbeddedAttemptResources } from "./attempt-subscription-cleanup.js"; describe("cleanupEmbeddedAttemptResources", () => { afterEach(() => { diff --git a/src/agents/embedded-agent-runner/run/attempt.test.ts b/src/agents/embedded-agent-runner/run/attempt.test.ts index f2e7c853f32e..ff989e5fdd86 100644 --- a/src/agents/embedded-agent-runner/run/attempt.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.test.ts @@ -19,7 +19,7 @@ import { resolveEmbeddedAgentBaseStreamFn, resolveEmbeddedAgentStreamFn as resolveEmbeddedAgentStreamFnImpl, } from "../stream-resolution.js"; -import { buildContextEnginePromptCacheInfo } from "./attempt.context-engine-helpers.js"; +import { buildContextEnginePromptCacheInfo } from "./attempt-context-engine-helpers.js"; import { buildAfterTurnRuntimeContext, buildAfterTurnRuntimeContextFromUsage, @@ -29,14 +29,14 @@ import { resolvePromptBuildHookResult, resolvePromptModeForSession, shouldWarnOnOrphanedUserRepair, -} from "./attempt.prompt-helpers.js"; -import { composeSystemPromptWithHookContext } from "./attempt.thread-helpers.js"; +} from "./attempt-prompt-helpers.js"; +import { composeSystemPromptWithHookContext } from "./attempt-thread-helpers.js"; +import { buildEmbeddedAttemptToolRunContext } from "./attempt-tool-run-context.js"; import { wrapStreamFnRepairMalformedToolCallArguments } from "./attempt.tool-call-argument-repair.js"; import { wrapStreamFnSanitizeMalformedToolCalls, wrapStreamFnTrimToolCallNames, } from "./attempt.tool-call-normalization.js"; -import { buildEmbeddedAttemptToolRunContext } from "./attempt.tool-run-context.js"; const llmRuntime = { ...defaultLlmRuntime, diff --git a/src/agents/embedded-agent-runner/run/attempt.tool-call-argument-repair.ts b/src/agents/embedded-agent-runner/run/attempt.tool-call-argument-repair.ts index c5eed8d60851..00c5bb6bcab5 100644 --- a/src/agents/embedded-agent-runner/run/attempt.tool-call-argument-repair.ts +++ b/src/agents/embedded-agent-runner/run/attempt.tool-call-argument-repair.ts @@ -7,7 +7,7 @@ import type { StreamFn } from "../../runtime/index.js"; import type { MutableAssistantMessageEventStream } from "../../stream-compat.js"; import { log } from "../logger.js"; import { createHtmlEntityToolCallArgumentDecodingWrapper } from "../tool-call-argument-decoding.js"; -import { isRunnerToolCallBlockType } from "./attempt.tool-call-block-type.js"; +import { isRunnerToolCallBlockType } from "./attempt-tool-call-block-type.js"; import { wrapStreamObjectEvents } from "./stream-wrapper.js"; const MAX_TOOLCALL_REPAIR_BUFFER_CHARS = 64_000; diff --git a/src/agents/embedded-agent-runner/run/attempt.tool-call-normalization.ts b/src/agents/embedded-agent-runner/run/attempt.tool-call-normalization.ts index c2587a05539b..eeaf2e8554aa 100644 --- a/src/agents/embedded-agent-runner/run/attempt.tool-call-normalization.ts +++ b/src/agents/embedded-agent-runner/run/attempt.tool-call-normalization.ts @@ -36,7 +36,7 @@ import { import { couldNormalizeToolNamePrefixToAllowedTool, normalizeToolName } from "../../tool-policy.js"; import { shouldAllowProviderOwnedThinkingReplay } from "../../transcript-policy.js"; import type { TranscriptPolicy } from "../../transcript-policy.js"; -import { isRunnerToolCallBlockType } from "./attempt.tool-call-block-type.js"; +import { isRunnerToolCallBlockType } from "./attempt-tool-call-block-type.js"; import { wrapStreamObjectEvents } from "./stream-wrapper.js"; const BLANK_TOOL_CALL_NAME_DESCRIPTION = "blank tool name"; diff --git a/src/agents/embedded-agent-runner/run/attempt.tool-search-catalog-abort.test.ts b/src/agents/embedded-agent-runner/run/attempt.tool-search-catalog-abort.test.ts index d4e3e33832ab..4cf1c189a57e 100644 --- a/src/agents/embedded-agent-runner/run/attempt.tool-search-catalog-abort.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.tool-search-catalog-abort.test.ts @@ -7,7 +7,7 @@ import { getHoisted, preloadRunEmbeddedAttemptForTests, resetEmbeddedAttemptHarness, -} from "./attempt.spawn-workspace.test-support.js"; +} from "./attempt-spawn-workspace.test-support.js"; const hoisted = getHoisted(); const tempPaths: string[] = []; diff --git a/src/agents/embedded-agent-runner/run/attempt.tool-search-run-plan.test.ts b/src/agents/embedded-agent-runner/run/attempt.tool-search-run-plan.test.ts index 2df05227d5f1..e15ac7756b63 100644 --- a/src/agents/embedded-agent-runner/run/attempt.tool-search-run-plan.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.tool-search-run-plan.test.ts @@ -1,7 +1,7 @@ // Coverage for Tool Search control planning and allowlist accounting. import { describe, expect, it } from "vitest"; import { setPluginToolMeta } from "../../../plugins/tools.js"; -import { buildToolSearchRunPlan } from "./attempt.tool-search-run-plan.js"; +import { buildToolSearchRunPlan } from "./attempt-tool-search-run-plan.js"; describe("buildToolSearchRunPlan", () => { it("keeps compact visible names separate from replay-safe names", () => { diff --git a/src/agents/embedded-agent-runner/run/attempt.ts b/src/agents/embedded-agent-runner/run/attempt.ts index ac4f1875c316..4c7152e1d0b0 100644 --- a/src/agents/embedded-agent-runner/run/attempt.ts +++ b/src/agents/embedded-agent-runner/run/attempt.ts @@ -32,6 +32,10 @@ import { } from "./attempt-finalize.js"; import { prepareEmbeddedAttemptSessionRuntime } from "./attempt-session-runtime-prepare.js"; import { cleanupEmbeddedAttemptSessionPhase } from "./attempt-session-settle.js"; +import { + queueSessionsYieldInterruptMessage, + SESSIONS_YIELD_ABORT_REASON, +} from "./attempt-sessions-yield.js"; import { prepareEmbeddedAttemptSetup, prepareEmbeddedAttemptSkills, @@ -43,10 +47,6 @@ import { prepareEmbeddedAttemptSystemPrompt } from "./attempt-system-prompt-prep import { prepareEmbeddedAttemptToolCatalog } from "./attempt-tool-catalog.js"; import { prepareEmbeddedAttemptToolBase } from "./attempt-tool-prepare.js"; import { prepareEmbeddedAttemptTranscriptLifecycle } from "./attempt-transcript-lifecycle-prepare.js"; -import { - queueSessionsYieldInterruptMessage, - SESSIONS_YIELD_ABORT_REASON, -} from "./attempt.sessions-yield.js"; import { measureEmbeddedAgentPreparation, measureEmbeddedAgentPreparationSync, diff --git a/src/agents/embedded-agent-runner/run/attempt.ultra-thinking.test.ts b/src/agents/embedded-agent-runner/run/attempt.ultra-thinking.test.ts index c026daa3c5fa..4303bb7b7bda 100644 --- a/src/agents/embedded-agent-runner/run/attempt.ultra-thinking.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.ultra-thinking.test.ts @@ -7,7 +7,7 @@ import { getHoisted, preloadRunEmbeddedAttemptForTests, resetEmbeddedAttemptHarness, -} from "./attempt.spawn-workspace.test-support.js"; +} from "./attempt-spawn-workspace.test-support.js"; const hoisted = getHoisted(); const tempPaths: string[] = []; diff --git a/src/agents/embedded-agent-runner/run/attempt.user-transcript-context-registry.test.ts b/src/agents/embedded-agent-runner/run/attempt.user-transcript-context-registry.test.ts index 7500282990e1..8f22f8d1aea3 100644 --- a/src/agents/embedded-agent-runner/run/attempt.user-transcript-context-registry.test.ts +++ b/src/agents/embedded-agent-runner/run/attempt.user-transcript-context-registry.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; import type { AgentMessage } from "../../runtime/index.js"; -import { createUserTranscriptContextRegistry } from "./attempt.user-transcript-context-registry.js"; +import { createUserTranscriptContextRegistry } from "./attempt-user-transcript-context-registry.js"; describe("createUserTranscriptContextRegistry", () => { it("retains a recorder-backed initial turn after a queued turn becomes latest", () => { diff --git a/src/agents/embedded-agent-runner/run/message-merge-strategy.ts b/src/agents/embedded-agent-runner/run/message-merge-strategy.ts index 450ec4d7a721..57eee2e448a4 100644 --- a/src/agents/embedded-agent-runner/run/message-merge-strategy.ts +++ b/src/agents/embedded-agent-runner/run/message-merge-strategy.ts @@ -1,7 +1,7 @@ /** * Reconciles orphaned trailing user prompts before provider submission. */ -import { mergeOrphanedTrailingUserPrompt } from "./attempt.prompt-helpers.js"; +import { mergeOrphanedTrailingUserPrompt } from "./attempt-prompt-helpers.js"; import type { EmbeddedRunAttemptParams } from "./types.js"; /** Inputs required to reconcile an active session leaf with the prompt about to be sent. */ diff --git a/src/agents/embedded-agent-runner/run/transcript-repair-runtime-contract.test.ts b/src/agents/embedded-agent-runner/run/transcript-repair-runtime-contract.test.ts index 9b58e598122a..61860af58199 100644 --- a/src/agents/embedded-agent-runner/run/transcript-repair-runtime-contract.test.ts +++ b/src/agents/embedded-agent-runner/run/transcript-repair-runtime-contract.test.ts @@ -7,7 +7,7 @@ import { textOrphanLeaf, } from "openclaw/plugin-sdk/agent-runtime-test-contracts"; import { describe, expect, it } from "vitest"; -import { mergeOrphanedTrailingUserPrompt } from "./attempt.prompt-helpers.js"; +import { mergeOrphanedTrailingUserPrompt } from "./attempt-prompt-helpers.js"; import { resolveMessageMergeStrategy } from "./message-merge-strategy.js"; describe("embedded agent transcript repair runtime contract", () => { diff --git a/src/agents/harness/context-engine-lifecycle.ts b/src/agents/harness/context-engine-lifecycle.ts index 83cf33d77d1c..1d9ea267026a 100644 --- a/src/agents/harness/context-engine-lifecycle.ts +++ b/src/agents/harness/context-engine-lifecycle.ts @@ -23,7 +23,7 @@ import { runContextEngineMaintenance } from "../embedded-agent-runner/context-en import { buildAfterTurnRuntimeContext, buildAfterTurnRuntimeContextFromUsage, -} from "../embedded-agent-runner/run/attempt.prompt-helpers.js"; +} from "../embedded-agent-runner/run/attempt-prompt-helpers.js"; import { stripRuntimeContextCustomMessages } from "../internal-runtime-context.js"; import type { AgentMessage } from "../runtime/index.js"; diff --git a/src/agents/sessions/agent-session-loop-correctness.test.ts b/src/agents/sessions/agent-session-loop-correctness.test.ts index 681b25dd92a1..e4e7c6ce9ed9 100644 --- a/src/agents/sessions/agent-session-loop-correctness.test.ts +++ b/src/agents/sessions/agent-session-loop-correctness.test.ts @@ -5,7 +5,7 @@ import { } from "openclaw/plugin-sdk/llm"; import { Type } from "typebox"; import { describe, expect, it, vi } from "vitest"; -import { steerActiveSessionWithOptionalDeliveryWait } from "../embedded-agent-runner/run/attempt.queue-message.js"; +import { steerActiveSessionWithOptionalDeliveryWait } from "../embedded-agent-runner/run/attempt-queue-message.js"; import { agentSessionAutomaticCompaction } from "./agent-session-compaction.js"; import { appendHistory, diff --git a/src/agents/sessions/agent-session-loop-next-turn.test.ts b/src/agents/sessions/agent-session-loop-next-turn.test.ts index 59a9ec249be8..2f26d7163de0 100644 --- a/src/agents/sessions/agent-session-loop-next-turn.test.ts +++ b/src/agents/sessions/agent-session-loop-next-turn.test.ts @@ -7,7 +7,7 @@ import { } from "openclaw/plugin-sdk/llm"; import { Type } from "typebox"; import { describe, expect, it, vi } from "vitest"; -import { steerActiveSessionWithOptionalDeliveryWait } from "../embedded-agent-runner/run/attempt.queue-message.js"; +import { steerActiveSessionWithOptionalDeliveryWait } from "../embedded-agent-runner/run/attempt-queue-message.js"; import type { AgentTool } from "../runtime/index.js"; import { createAssistant, diff --git a/src/agents/tools/ask-user-tool.test.ts b/src/agents/tools/ask-user-tool.test.ts index d49850ce6ec0..f7b1394aedc9 100644 --- a/src/agents/tools/ask-user-tool.test.ts +++ b/src/agents/tools/ask-user-tool.test.ts @@ -1,7 +1,7 @@ import { Value } from "typebox/value"; import { afterEach, describe, expect, it, vi } from "vitest"; import type { UserTurnTranscriptRecorder } from "../../sessions/user-turn-transcript.types.js"; -import { steerActiveSessionWithOptionalDeliveryWait } from "../embedded-agent-runner/run/attempt.queue-message.js"; +import { steerActiveSessionWithOptionalDeliveryWait } from "../embedded-agent-runner/run/attempt-queue-message.js"; import { cancelAskUserPromptDelivery, createAskUserTool, diff --git a/src/plugin-sdk/agent-harness-runtime.ts b/src/plugin-sdk/agent-harness-runtime.ts index cb491fda1d4e..8074d8fff3fc 100644 --- a/src/plugin-sdk/agent-harness-runtime.ts +++ b/src/plugin-sdk/agent-harness-runtime.ts @@ -238,9 +238,9 @@ export { SKILL_WORKSHOP_TOOL_NAME, } from "../agents/skill-workshop-prompt.js"; export { TRANSCRIPT_CREDENTIAL_SAFETY_PROMPT } from "../agents/transcript-credential-safety.js"; -export { resolveAttemptFsWorkspaceOnly } from "../agents/embedded-agent-runner/run/attempt.prompt-helpers.js"; -export { resolveAttemptSpawnWorkspaceDir } from "../agents/embedded-agent-runner/run/attempt.thread-helpers.js"; -export { buildEmbeddedAttemptToolRunContext } from "../agents/embedded-agent-runner/run/attempt.tool-run-context.js"; +export { resolveAttemptFsWorkspaceOnly } from "../agents/embedded-agent-runner/run/attempt-prompt-helpers.js"; +export { resolveAttemptSpawnWorkspaceDir } from "../agents/embedded-agent-runner/run/attempt-thread-helpers.js"; +export { buildEmbeddedAttemptToolRunContext } from "../agents/embedded-agent-runner/run/attempt-tool-run-context.js"; export { applyEmbeddedAttemptToolsAllow, resolveEmbeddedAttemptToolConstructionPlan,