@downcity/agent 1.1.13 → 1.1.15

package/src/service/builtins/contact/Action.ts

@@ -2,11 +2,11 @@
  * contact action 注册表。
  *
  * 关键点（中文）
- * - 这里只负责 CLI / HTTP action 映射，不承载 contact 业务实现。
+ * - 这里只负责 CLI action 与内部远端 command action 映射，不承载 contact 业务实现。
  * - 业务动作通过 handlers 注入，保持 `ContactService` 类本身更薄。
  */
 
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type { ServiceActions } from "@/service/types/Service.js";
 import type {
@@ -31,7 +31,6 @@ import { receiveContactChatMessage } from "./runtime/ChatRuntime.js";
 import { listContactInboxShares } from "./runtime/InboxStore.js";
 import { receiveShare } from "./runtime/ShareBundle.js";
 import {
-  getContactHeaderToken,
   readContactObject,
   readContactString,
 } from "./runtime/ContactPayload.js";
@@ -267,20 +266,6 @@ export function createContactActions(handlers: ContactActionHandlers): ServiceAc
       }),
     },
     remoteping: {
-      api: {
-        method: "POST",
-        path: "/api/contact/ping",
-        async mapInput(ctx) {
-          const body = (await ctx.req.json().catch(() => ({}))) as JsonValue;
-          return {
-            body,
-            token: getContactHeaderToken({
-              headers: ctx.req.raw.headers,
-              body: readContactObject(body),
-            }),
-          } as unknown as JsonValue;
-        },
-      },
       execute: async (params) => ({
         success: true,
         data: (await handlers.remotePing(
@@ -290,13 +275,6 @@ export function createContactActions(handlers: ContactActionHandlers): ServiceAc
       }),
     },
     remoteapprove: {
-      api: {
-        method: "POST",
-        path: "/api/contact/approve",
-        async mapInput(ctx) {
-          return (await ctx.req.json()) as JsonValue;
-        },
-      },
       execute: async (params) => ({
         success: true,
         data: (await handlers.remoteApprove(
@@ -306,13 +284,6 @@ export function createContactActions(handlers: ContactActionHandlers): ServiceAc
       }),
     },
     remoteconfirm: {
-      api: {
-        method: "POST",
-        path: "/api/contact/confirm",
-        async mapInput(ctx) {
-          return (await ctx.req.json()) as JsonValue;
-        },
-      },
       execute: async (params) => ({
         success: true,
         data: (await handlers.remoteConfirm(
@@ -322,20 +293,6 @@ export function createContactActions(handlers: ContactActionHandlers): ServiceAc
       }),
     },
     remotechat: {
-      api: {
-        method: "POST",
-        path: "/api/contact/chat",
-        async mapInput(ctx) {
-          const body = (await ctx.req.json()) as JsonValue;
-          return {
-            body,
-            token: getContactHeaderToken({
-              headers: ctx.req.raw.headers,
-              body: readContactObject(body),
-            }),
-          } as unknown as JsonValue;
-        },
-      },
       execute: async (params) => {
         const payload = readContactObject(params.payload);
         const body = readContactObject(payload.body);
@@ -350,20 +307,6 @@ export function createContactActions(handlers: ContactActionHandlers): ServiceAc
       },
     },
     remoteshare: {
-      api: {
-        method: "POST",
-        path: "/api/contact/share",
-        async mapInput(ctx) {
-          const body = (await ctx.req.json()) as JsonValue;
-          return {
-            body,
-            token: getContactHeaderToken({
-              headers: ctx.req.raw.headers,
-              body: readContactObject(body),
-            }),
-          } as unknown as JsonValue;
-        },
-      },
       execute: async (params) => ({
         success: true,
         data: (await handlers.remoteShare(params.context, params.payload)) as unknown as JsonValue,

package/src/service/builtins/contact/ContactService.ts

@@ -7,8 +7,8 @@
  * - `share` 分享文本、链接、文件和目录，并进入对方 inbox。
  */
 
-import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type { ServiceActions } from "@/service/types/Service.js";
 import { BaseService } from "@/service/builtins/BaseService.js";

package/src/service/builtins/contact/runtime/ChatRuntime.ts

@@ -6,7 +6,7 @@
  * - 远端收到 chat 后运行本地 agent session，并返回 assistant 文本。
  */
 
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { ContactChatResponse } from "@/service/builtins/contact/types/ContactChat.js";
 import type { SessionMessageV1 } from "@/session/types/SessionMessages.js";
 import {

package/src/service/builtins/contact/runtime/ContactPayload.ts

@@ -24,15 +24,3 @@ export function readContactString(body: JsonObject, key: string): string {
   const value = body[key];
   return typeof value === "string" ? value.trim() : "";
 }
-
-/**
- * 从 contact HTTP header 或 body 中读取 contact token。
- */
-export function getContactHeaderToken(params: {
-  headers?: Headers;
-  body?: JsonObject;
-}): string {
-  const fromHeader = String(params.headers?.get("x-downcity-contact-token") || "").trim();
-  if (fromHeader) return fromHeader;
-  return params.body ? readContactString(params.body, "token") : "";
-}

package/src/service/builtins/contact/runtime/RemoteClient.ts

@@ -2,7 +2,7 @@
  * contact 远端 HTTP 客户端。
  *
  * 关键点（中文）
- * - contact 的 agent-to-agent 调用走独立轻量路由，不依赖用户 CLI auth。
+ * - contact 的 agent-to-agent 调用统一走 `/api/services/command`。
  * - 已建联后的敏感调用必须携带 contact token。
  */
 
@@ -25,32 +25,51 @@ function normalizeEndpoint(endpoint: string): string {
   return url.toString().replace(/\/$/, "");
 }
 
-function unwrapServiceActionEnvelope<T>(value: T): T {
+function unwrapServiceCommandEnvelope<T>(value: T): T {
   if (!isRecord(value)) return value;
   const inner = value.data;
   if (typeof value.success === "boolean" && isRecord(inner)) {
-    // 关键点（中文）：远端 contact API 挂在统一 service action route 下，HTTP 返回会包一层 { success, data }。
+    // 关键点（中文）：统一 command 路由会包一层 `{ success, data }`。
     return inner as T;
   }
   return value;
 }
 
-async function postJson<T>(params: {
+async function postServiceCommand<T>(params: {
   endpoint: string;
-  path: string;
+  command: string;
   body?: JsonValue;
   token?: string;
+  wrapBody?: boolean;
 }): Promise<T> {
-  const url = new URL(params.path, normalizeEndpoint(params.endpoint)).toString();
+  const url = new URL("/api/services/command", normalizeEndpoint(params.endpoint)).toString();
+  const payloadBody =
+    params.wrapBody
+      ? {
+          ...(params.body !== undefined ? { body: params.body } : {}),
+          ...(params.token ? { token: params.token } : {}),
+        }
+      : params.body && isRecord(params.body)
+        ? {
+            ...params.body,
+            ...(params.token ? { token: params.token } : {}),
+          }
+        : {
+            ...(params.body !== undefined ? { body: params.body } : {}),
+            ...(params.token ? { token: params.token } : {}),
+          };
   const headers: Record<string, string> = {
     "Content-Type": "application/json",
   };
-  if (params.token) headers["X-Downcity-Contact-Token"] = params.token;
 
   const response = await fetch(url, {
     method: "POST",
     headers,
-    body: JSON.stringify(params.body ?? {}),
+    body: JSON.stringify({
+      serviceName: "contact",
+      command: params.command,
+      payload: payloadBody,
+    }),
   });
   const data = (await response.json().catch(() => null)) as T & {
     error?: string;
@@ -59,7 +78,7 @@ async function postJson<T>(params: {
   if (!response.ok) {
     throw new Error(data?.error || data?.message || `HTTP ${response.status}`);
   }
-  return unwrapServiceActionEnvelope<T>(data);
+  return unwrapServiceCommandEnvelope<T>(data);
 }
 
 /**
@@ -69,9 +88,9 @@ export async function callContactPing<T>(params: {
   endpoint: string;
   token?: string;
 }): Promise<T> {
-  return await postJson<T>({
+  return await postServiceCommand<T>({
     endpoint: params.endpoint,
-    path: "/api/contact/ping",
+    command: "remoteping",
     token: params.token,
   });
 }
@@ -83,9 +102,9 @@ export async function callContactApprove<T>(params: {
   endpoint: string;
   body: JsonValue;
 }): Promise<T> {
-  return await postJson<T>({
+  return await postServiceCommand<T>({
     endpoint: params.endpoint,
-    path: "/api/contact/approve",
+    command: "remoteapprove",
     body: params.body,
   });
 }
@@ -97,9 +116,9 @@ export async function callContactConfirm<T>(params: {
   endpoint: string;
   body: JsonValue;
 }): Promise<T> {
-  return await postJson<T>({
+  return await postServiceCommand<T>({
     endpoint: params.endpoint,
-    path: "/api/contact/confirm",
+    command: "remoteconfirm",
     body: params.body,
   });
 }
@@ -112,11 +131,12 @@ export async function callContactChat<T>(params: {
   token: string;
   body: JsonValue;
 }): Promise<T> {
-  return await postJson<T>({
+  return await postServiceCommand<T>({
     endpoint: params.endpoint,
-    path: "/api/contact/chat",
+    command: "remotechat",
     token: params.token,
     body: params.body,
+    wrapBody: true,
   });
 }
 
@@ -128,10 +148,11 @@ export async function callContactShare<T>(params: {
   token: string;
   body: JsonValue;
 }): Promise<T> {
-  return await postJson<T>({
+  return await postServiceCommand<T>({
     endpoint: params.endpoint,
-    path: "/api/contact/share",
+    command: "remoteshare",
     token: params.token,
     body: params.body,
+    wrapBody: true,
   });
 }

package/src/service/builtins/contact/runtime/ShareBundle.ts

@@ -9,7 +9,7 @@
 import crypto from "node:crypto";
 import fs from "fs-extra";
 import path from "node:path";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   ContactInboxShareFileInput,
   ContactInboxShareMeta,

package/src/service/builtins/memory/Action.ts

@@ -7,7 +7,7 @@
  */
 
 import type { ServiceActionResult } from "@/service/types/Service.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type {
   MemoryFlushPayload,

package/src/service/builtins/memory/MemoryService.ts

@@ -9,7 +9,7 @@
 
 import type { Command } from "commander";
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { ServiceActions } from "@/service/types/Service.js";
 import { BaseService } from "@/service/builtins/BaseService.js";
 import {
@@ -123,9 +123,6 @@ export class MemoryService extends BaseService {
           return {};
         },
       },
-      api: {
-        method: "GET",
-      },
       execute: async (params) => {
         const state = this.getOrCreateRuntimeState(params.context);
         return await statusMemoryAction(params.context, state);
@@ -153,12 +150,6 @@ export class MemoryService extends BaseService {
           return payload;
         },
       },
-      api: {
-        method: "POST",
-        mapInput(ctx) {
-          return ctx.req.json();
-        },
-      },
       execute: async (params) => {
         const body = readBodyObject(params.payload);
         const state = this.getOrCreateRuntimeState(params.context);
@@ -191,12 +182,6 @@ export class MemoryService extends BaseService {
           return payload;
         },
       },
-      api: {
-        method: "POST",
-        mapInput(ctx) {
-          return ctx.req.json();
-        },
-      },
       execute: async (params) => {
         const body = readBodyObject(params.payload);
         return await getMemoryAction(params.context, {
@@ -228,12 +213,6 @@ export class MemoryService extends BaseService {
           return payload;
         },
       },
-      api: {
-        method: "POST",
-        mapInput(ctx) {
-          return ctx.req.json();
-        },
-      },
       execute: async (params) => {
         const body = readBodyObject(params.payload);
         const target = readOptionalString(body, "target");
@@ -266,12 +245,6 @@ export class MemoryService extends BaseService {
           return payload;
         },
       },
-      api: {
-        method: "POST",
-        mapInput(ctx) {
-          return ctx.req.json();
-        },
-      },
       execute: async (params) => {
         const body = readBodyObject(params.payload);
         const state = this.getOrCreateRuntimeState(params.context);

package/src/service/builtins/memory/runtime/Flush.ts

@@ -8,7 +8,7 @@
 
 import type { UIDataTypes, UIMessagePart, UITools } from "ai";
 import { isTextUIPart } from "ai";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   MemoryFlushPayload,
   MemoryFlushResponse,

package/src/service/builtins/memory/runtime/Search.ts

@@ -7,7 +7,7 @@
  */
 
 import fs from "node:fs/promises";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   MemorySearchPayload,
   MemorySearchResponse,

package/src/service/builtins/memory/runtime/Store.ts

@@ -11,7 +11,7 @@
 import type { Dirent } from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   MemoryDefaults,
   MemorySourceType,

package/src/service/builtins/memory/runtime/SystemProvider.ts

@@ -8,7 +8,7 @@
 
 import fs from "node:fs/promises";
 import path from "node:path";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import { isMemoryEnabled } from "./Store.js";
 
 const MAX_SYSTEM_MEMORY_ITEMS = 6;

package/src/service/builtins/memory/runtime/Writer.ts

@@ -8,7 +8,7 @@
 
 import fs from "node:fs/promises";
 import path from "node:path";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   MemoryGetPayload,
   MemoryGetResponse,

package/src/service/builtins/schedule/ScheduleService.ts

@@ -0,0 +1,131 @@
+/**
+ * ScheduleService：通用延迟/定时 service action 调度器。
+ *
+ * 关键点（中文）
+ * - 这是 service 系统内部的基础设施 service，不直接承载业务 action。
+ * - 它负责轮询 `ServiceScheduleStore`，把到点任务重新派发回对应 service action。
+ * - 这样调度能力就归属于 service lifecycle，而不是 Agent 顶层 lifecycle。
+ */
+
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
+import { BaseService } from "@/service/builtins/BaseService.js";
+import { runDueScheduledJobs } from "@/service/core/schedule/Executor.js";
+import { ServiceScheduleStore } from "@/service/core/schedule/Store.js";
+import type { ServiceActions } from "@/service/types/Service.js";
+
+const SCHEDULE_POLL_INTERVAL_MS = 200;
+const SCHEDULE_LOG_PREFIX = "[SCHEDULE]";
+
+function formatScheduleLogMessage(message: string): string {
+  return `${SCHEDULE_LOG_PREFIX} ${message}`;
+}
+
+type ScheduleRuntimeState = {
+  timer: NodeJS.Timeout | null;
+  ticking: boolean;
+  store: ServiceScheduleStore;
+  context: AgentContext;
+};
+
+/**
+ * 通用调度 service。
+ */
+export class ScheduleService extends BaseService {
+  /**
+   * 当前 service 名称。
+   */
+  readonly name = "schedule";
+
+  /**
+   * 当前 service 不暴露业务 action。
+   */
+  readonly actions: ServiceActions = {};
+
+  /**
+   * 当前实例持有的调度 runtime 状态。
+   */
+  private runtimeState: ScheduleRuntimeState | null = null;
+
+  constructor(agent: AgentRuntime | null) {
+    super(agent);
+
+    this.lifecycle = {
+      start: async (context) => {
+        const started = await this.startRuntime(context);
+        if (!started) return;
+        context.logger.info(
+          formatScheduleLogMessage("Service scheduler started"),
+        );
+      },
+      stop: async (context) => {
+        const stopped = await this.stopRuntime();
+        if (!stopped) return;
+        context.logger.info(
+          formatScheduleLogMessage("Service scheduler stopped"),
+        );
+      },
+    };
+  }
+
+  /**
+   * 启动当前实例的调度 runtime。
+   */
+  async startRuntime(context: AgentContext): Promise<boolean> {
+    if (this.runtimeState) return false;
+
+    const store = new ServiceScheduleStore(context.rootPath);
+    const recovered = store.resetRunningJobsToPending();
+    if (recovered > 0) {
+      context.logger.warn(
+        formatScheduleLogMessage("Recovered interrupted running jobs"),
+        { recovered },
+      );
+    }
+
+    this.runtimeState = {
+      timer: null,
+      ticking: false,
+      store,
+      context,
+    };
+
+    const tick = async () => {
+      const state = this.runtimeState;
+      if (!state || state.ticking) return;
+      state.ticking = true;
+      try {
+        await runDueScheduledJobs({
+          context: state.context,
+          store: state.store,
+        });
+      } finally {
+        const current = this.runtimeState;
+        if (current) {
+          current.ticking = false;
+        }
+      }
+    };
+
+    await tick();
+    this.runtimeState.timer = setInterval(() => {
+      void tick();
+    }, SCHEDULE_POLL_INTERVAL_MS);
+
+    return true;
+  }
+
+  /**
+   * 停止当前实例的调度 runtime。
+   */
+  async stopRuntime(): Promise<boolean> {
+    if (!this.runtimeState) return false;
+    const current = this.runtimeState;
+    this.runtimeState = null;
+    if (current.timer) {
+      clearInterval(current.timer);
+    }
+    current.store.close();
+    return true;
+  }
+}

package/src/service/builtins/shell/ShellRuntimeTypes.ts

@@ -8,7 +8,7 @@
  */
 
 import type { ChildProcessWithoutNullStreams } from "node:child_process";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { ShellSessionSnapshot } from "@/service/builtins/shell/types/ShellService.js";
 
 /**

package/src/service/builtins/shell/ShellService.ts

@@ -7,10 +7,10 @@
  * - ShellActionRuntime 只保留纯运行时流程，不再承载模块级单例状态。
  */
 
-import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import { BaseService } from "@/service/builtins/BaseService.js";
 import type { ServiceActions } from "@/service/types/Service.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   ShellServiceState,
   ShellSessionRuntimeState,

package/src/service/builtins/shell/runtime/ShellActionResponse.ts

@@ -6,7 +6,7 @@
  * - 这里不读取文件、不修改 session，只基于传入文本构造返回对象。
  */
 
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   ShellActionResponse,
   ShellOutputChunk,

package/src/service/builtins/shell/runtime/ShellActionRuntime.ts

@@ -8,7 +8,7 @@
  */
 
 import fs from "fs-extra";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import { spawnShellProcess } from "@/sandbox/SandboxRunner.js";
 import type {
   ShellServiceState,

package/src/service/builtins/shell/runtime/ShellActionRuntimeSupport.ts

@@ -8,7 +8,7 @@
 
 import path from "node:path";
 import fs from "fs-extra";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   ShellServiceState,
   ShellSessionRuntimeState,

package/src/service/builtins/shell/runtime/ShellRuntimeEnvironment.ts

@@ -7,7 +7,7 @@
  */
 
 import path from "node:path";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import { stripInvocationAuthEnv } from "@/server/http/auth/AuthEnv.js";
 import { getSessionRunScope } from "@session/SessionRunScope.js";
 

package/src/service/builtins/task/Action.ts

@@ -8,7 +8,7 @@
 
 import path from "node:path";
 import type { ShipTaskStatus } from "./types/Task.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import {
   deriveTaskIdFromTitle,

package/src/service/builtins/task/Scheduler.ts

@@ -6,7 +6,7 @@
  * - cron 调度执行器由 server 注入，service 不依赖具体实现。
  */
 
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import {
   isTaskWhenManual,
   resolveTaskWhenCronExpression,

package/src/service/builtins/task/TaskService.ts

@@ -7,10 +7,10 @@
  * - 当前文件只保留实例骨架与 lifecycle，不再依赖旧的模块级 `taskService` 单例。
  */
 
-import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
+import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import { BaseService } from "@/service/builtins/BaseService.js";
 import type { ServiceActions } from "@/service/types/Service.js";
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type {
   TaskCronRegisterResult,
   TaskSchedulerReloadResult,

package/src/service/builtins/task/runtime/CronRuntime.ts

@@ -6,7 +6,7 @@
  * - 该模块是 task service 内部实现细节，core 只通过 service lifecycle 间接调用。
  */
 
-import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { AgentContext } from "@/core/AgentContextTypes.js";
 import { registerTaskCronJobs } from "@/service/builtins/task/Scheduler.js";
 import { TaskCronTriggerEngine } from "./CronTrigger.js";