fix(utils): split delivery context shared types

vincentkoc · vincentkoc · commit 2028fd53f077 · 2026-04-11T17:03:38.000+01:00
diff --git a/src/config/sessions/runtime-types.ts b/src/config/sessions/runtime-types.ts
@@ -1,5 +1,5 @@
 import type { MsgContext } from "../../auto-reply/templating.js";
-import type { DeliveryContext } from "../../utils/delivery-context.shared.js";
+import type { DeliveryContext } from "../../utils/delivery-context.types.js";
 import type { SessionMaintenanceMode } from "../types.base.js";
 import type { SessionEntry, GroupKeyResolution } from "./types.js";
 
diff --git a/src/plugins/tool-types.ts b/src/plugins/tool-types.ts
@@ -2,7 +2,7 @@ import type { ToolFsPolicy } from "../agents/tool-fs-policy.js";
 import type { AnyAgentTool } from "../agents/tools/common.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import type { HookEntry } from "../hooks/types.js";
-import type { DeliveryContext } from "../utils/delivery-context.shared.js";
+import type { DeliveryContext } from "../utils/delivery-context.types.js";
 
 /** Trusted execution context passed to plugin-owned agent tool factories. */
 export type OpenClawPluginToolContext = {
diff --git a/src/tasks/task-flow-registry.types.ts b/src/tasks/task-flow-registry.types.ts
@@ -1,4 +1,4 @@
-import type { DeliveryContext } from "../utils/delivery-context.shared.js";
+import type { DeliveryContext } from "../utils/delivery-context.types.js";
 import type { TaskNotifyPolicy } from "./task-registry.types.js";
 
 export type JsonValue =
diff --git a/src/tasks/task-registry.types.ts b/src/tasks/task-registry.types.ts
@@ -1,4 +1,4 @@
-import type { DeliveryContext } from "../utils/delivery-context.shared.js";
+import type { DeliveryContext } from "../utils/delivery-context.types.js";
 
 export type TaskRuntime = "subagent" | "acp" | "cli" | "cron";
 
diff --git a/src/utils/delivery-context.shared.ts b/src/utils/delivery-context.shared.ts
@@ -1,27 +1,8 @@
 import { normalizeOptionalString } from "../shared/string-coerce.js";
 import { normalizeAccountId } from "./account-id.js";
+import type { DeliveryContext, DeliveryContextSessionSource } from "./delivery-context.types.js";
 import { normalizeMessageChannel } from "./message-channel.js";
-
-export type DeliveryContext = {
-  channel?: string;
-  to?: string;
-  accountId?: string;
-  threadId?: string | number;
-};
-
-export type DeliveryContextSessionSource = {
-  channel?: string;
-  lastChannel?: string;
-  lastTo?: string;
-  lastAccountId?: string;
-  lastThreadId?: string | number;
-  origin?: {
-    provider?: string;
-    accountId?: string;
-    threadId?: string | number;
-  };
-  deliveryContext?: DeliveryContext;
-};
+export type { DeliveryContext, DeliveryContextSessionSource } from "./delivery-context.types.js";
 
 export function normalizeDeliveryContext(context?: DeliveryContext): DeliveryContext | undefined {
   if (!context) {
diff --git a/src/utils/delivery-context.ts b/src/utils/delivery-context.ts
@@ -7,9 +7,8 @@ export {
   mergeDeliveryContext,
   normalizeDeliveryContext,
   normalizeSessionDeliveryFields,
-  type DeliveryContext,
-  type DeliveryContextSessionSource,
 } from "./delivery-context.shared.js";
+export type { DeliveryContext, DeliveryContextSessionSource } from "./delivery-context.types.js";
 
 export function formatConversationTarget(params: {
   channel?: string;
diff --git a/src/utils/delivery-context.types.ts b/src/utils/delivery-context.types.ts
@@ -0,0 +1,20 @@
+export type DeliveryContext = {
+  channel?: string;
+  to?: string;
+  accountId?: string;
+  threadId?: string | number;
+};
+
+export type DeliveryContextSessionSource = {
+  channel?: string;
+  lastChannel?: string;
+  lastTo?: string;
+  lastAccountId?: string;
+  lastThreadId?: string | number;
+  origin?: {
+    provider?: string;
+    accountId?: string;
+    threadId?: string | number;
+  };
+  deliveryContext?: DeliveryContext;
+};

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { DeliveryContext } from "../utils/delivery-context.shared.js";`
	`1`	`+import type { DeliveryContext } from "../utils/delivery-context.types.js";`
`2`	`2`	`import type { TaskNotifyPolicy } from "./task-registry.types.js";`
`3`	`3`
`4`	`4`	`export type JsonValue =`