Skip to content

Commit 7308e72

Browse files
vincentkocvincentkoc
committed
fix(cycles): continue seam extraction
1 parent 6883273 commit 7308e72

76 files changed

Lines changed: 325 additions & 763 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/agents/auth-profiles/doctor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { OpenClawConfig } from "../../config/config.js";
22
import { buildProviderAuthDoctorHintWithPlugin } from "../../plugins/provider-runtime.runtime.js";
3-
import { normalizeProviderId } from "../model-selection.js";
3+
import { normalizeProviderId } from "../model-selection-normalize.js";
44
import type { AuthProfileStore } from "./types.js";
55

66
/**

‎src/agents/auth-profiles/external-auth.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import type { ProviderExternalAuthProfile } from "../../plugins/provider-external-auth.types.js";
12
import { resolveExternalAuthProfilesWithPlugins } from "../../plugins/provider-runtime.js";
2-
import type { ProviderExternalAuthProfile } from "../../plugins/types.js";
33
import type { AuthProfileStore, OAuthCredential } from "./types.js";
44

55
type ExternalAuthProfileMap = Map<string, ProviderExternalAuthProfile>;

‎src/agents/model-catalog.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type DiscoveredModel = {
2323
input?: ModelInputType[];
2424
};
2525

26-
type PiSdkModule = typeof import("./pi-model-discovery.js");
26+
type PiSdkModule = typeof import("./pi-model-discovery-runtime.js");
2727
type PiRegistryInstance =
2828
| Array<DiscoveredModel>
2929
| {

‎src/agents/model-selection.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
} from "./agent-scope.js";
2222
import { resolveConfiguredProviderFallback } from "./configured-provider-fallback.js";
2323
import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "./defaults.js";
24-
import type { ModelCatalogEntry } from "./model-catalog.js";
24+
import type { ModelCatalogEntry } from "./model-catalog.types.js";
2525
import { splitTrailingAuthProfile } from "./model-ref-profile.js";
2626
import {
2727
type ModelRef,

‎src/agents/pi-auth-credentials.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { normalizeOptionalString } from "../shared/string-coerce.js";
22
import type { AuthProfileCredential, AuthProfileStore } from "./auth-profiles.js";
3-
import { normalizeProviderId } from "./model-selection.js";
3+
import { normalizeProviderId } from "./provider-id.js";
44

55
export type PiApiKeyCredential = { type: "api_key"; key: string };
66
export type PiOAuthCredential = {

‎src/agents/pi-embedded-runner/compact.runtime.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
import { compactEmbeddedPiSessionDirect as compactEmbeddedPiSessionDirectImpl } from "./compact.js";
1+
import type { CompactEmbeddedPiSessionDirect } from "./compact.runtime.types.js";
22

3-
type CompactEmbeddedPiSessionDirect = typeof import("./compact.js").compactEmbeddedPiSessionDirect;
3+
let compactRuntimePromise: Promise<typeof import("./compact.js")> | null = null;
44

5-
export function compactEmbeddedPiSessionDirect(
5+
function loadCompactRuntime() {
6+
compactRuntimePromise ??= import("./compact.js");
7+
return compactRuntimePromise;
8+
}
9+
10+
export async function compactEmbeddedPiSessionDirect(
611
...args: Parameters<CompactEmbeddedPiSessionDirect>
712
): ReturnType<CompactEmbeddedPiSessionDirect> {
8-
return compactEmbeddedPiSessionDirectImpl(...args);
13+
const { compactEmbeddedPiSessionDirect } = await loadCompactRuntime();
14+
return compactEmbeddedPiSessionDirect(...args);
915
}

‎src/agents/pi-model-discovery.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ import {
1414
resolveProviderSyntheticAuthWithPlugin,
1515
} from "../plugins/provider-runtime.js";
1616
import { resolveRuntimeSyntheticAuthProviderRefs } from "../plugins/synthetic-auth.runtime.js";
17-
import type { ProviderRuntimeModel } from "../plugins/types.js";
1817
import { isRecord } from "../utils.js";
19-
import { ensureAuthProfileStore } from "./auth-profiles.js";
18+
import { ensureAuthProfileStore } from "./auth-profiles/store.js";
2019
import { resolveProviderEnvApiKeyCandidates } from "./model-auth-env-vars.js";
2120
import { resolveEnvApiKey } from "./model-auth-env.js";
2221
import { resolvePiCredentialMapFromStore, type PiCredentialMap } from "./pi-auth-credentials.js";
@@ -26,6 +25,10 @@ const PiModelRegistryClass = PiCodingAgent.ModelRegistry;
2625

2726
export { PiAuthStorageClass as AuthStorage, PiModelRegistryClass as ModelRegistry };
2827

28+
type ProviderRuntimeModelLike = Model<Api> & {
29+
contextTokens?: number;
30+
};
31+
2932
type InMemoryAuthStorageBackendLike = {
3033
withLock<T>(
3134
update: (current: string) => {
@@ -67,7 +70,7 @@ export function normalizeDiscoveredPiModel<T>(value: T, agentDir: string): T {
6770
) {
6871
return value;
6972
}
70-
const model = value as unknown as ProviderRuntimeModel;
73+
const model = value as unknown as ProviderRuntimeModelLike;
7174
const pluginNormalized =
7275
normalizeProviderResolvedModelWithPlugin({
7376
provider: model.provider,

‎src/agents/provider-auth-aliases.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { OpenClawConfig } from "../config/config.js";
1+
import type { OpenClawConfig } from "../config/types.openclaw.js";
22
import { normalizePluginsConfig, resolveEffectiveEnableState } from "../plugins/config-state.js";
33
import { loadPluginManifestRegistry } from "../plugins/manifest-registry.js";
44
import type { PluginManifestRecord } from "../plugins/manifest-registry.js";
5-
import type { PluginOrigin } from "../plugins/types.js";
5+
import type { PluginOrigin } from "../plugins/plugin-origin.types.js";
66
import { normalizeProviderId } from "./provider-id.js";
77

88
export type ProviderAuthAliasLookupParams = {

‎src/agents/subagent-registry-runtime.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
export {
22
countActiveDescendantRuns,
3+
getLatestSubagentRunByChildSessionKey,
4+
} from "./subagent-registry-read.js";
5+
export {
36
countPendingDescendantRuns,
47
countPendingDescendantRunsExcludingRun,
5-
getLatestSubagentRunByChildSessionKey,
68
isSubagentSessionRunActive,
79
listSubagentRunsForRequester,
8-
replaceSubagentRunAfterSteer,
910
resolveRequesterForChildSession,
1011
shouldIgnorePostCompletionAnnounceForSession,
11-
} from "./subagent-registry.js";
12+
} from "./subagent-registry-announce-read.js";
13+
export { replaceSubagentRunAfterSteer } from "./subagent-registry-steer-runtime.js";

‎src/auto-reply/dispatch.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { OpenClawConfig } from "../config/config.js";
2-
import type { DispatchFromConfigResult } from "./reply/dispatch-from-config.js";
32
import { dispatchReplyFromConfig } from "./reply/dispatch-from-config.js";
3+
import type { DispatchFromConfigResult } from "./reply/dispatch-from-config.types.js";
44
import { finalizeInboundContext } from "./reply/inbound-context.js";
55
import {
66
createReplyDispatcher,

0 commit comments

Comments
 (0)